Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Purge #8229

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Purge #8229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05ecea0
reduces baycode levels WARNING MAP UPDATE
vode-code Jul 11, 2023
b33b8d0
Merge branch 'master' of https://github.com/discordia-space/CEV-Eris …
vode-code Jul 11, 2023
1218700
re-removes blob damage from smokebomb
vode-code Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions cev_eris.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,6 @@
#include "code\game\gamemodes\endgame\supermatter_cascade\universe.dm"
#include "code\game\gamemodes\events\apc_damage.dm"
#include "code\game\gamemodes\events\black_hole.dm"
#include "code\game\gamemodes\events\blob.dm"
#include "code\game\gamemodes\events\brand_intelligence.dm"
#include "code\game\gamemodes\events\camera_damage.dm"
#include "code\game\gamemodes\events\carp_migration.dm"
Expand Down Expand Up @@ -937,7 +936,6 @@
#include "code\game\objects\items\devices\PDA\PDA.dm"
#include "code\game\objects\items\devices\PDA\radio.dm"
#include "code\game\objects\items\devices\radio\beacon.dm"
#include "code\game\objects\items\devices\radio\electropack.dm"
#include "code\game\objects\items\devices\radio\encryptionkey.dm"
#include "code\game\objects\items\devices\radio\headset.dm"
#include "code\game\objects\items\devices\radio\intercom.dm"
Expand Down Expand Up @@ -1064,7 +1062,6 @@
#include "code\game\objects\items\weapons\grenades\heatwave.dm"
#include "code\game\objects\items\weapons\grenades\smokebomb.dm"
#include "code\game\objects\items\weapons\grenades\sonic.dm"
#include "code\game\objects\items\weapons\grenades\spawnergrenade.dm"
#include "code\game\objects\items\weapons\implant\implant.dm"
#include "code\game\objects\items\weapons\implant\implantcase.dm"
#include "code\game\objects\items\weapons\implant\implanter.dm"
Expand Down Expand Up @@ -1225,7 +1222,6 @@
#include "code\game\objects\structures\cyberplants.dm"
#include "code\game\objects\structures\displaycase.dm"
#include "code\game\objects\structures\door_assembly.dm"
#include "code\game\objects\structures\electricchair.dm"
#include "code\game\objects\structures\extinguisher.dm"
#include "code\game\objects\structures\fireaxe_cabinet.dm"
#include "code\game\objects\structures\flora.dm"
Expand Down Expand Up @@ -1453,7 +1449,6 @@
#include "code\modules\assembly\infrared.dm"
#include "code\modules\assembly\mousetrap.dm"
#include "code\modules\assembly\proximity.dm"
#include "code\modules\assembly\shock_kit.dm"
#include "code\modules\assembly\signaler.dm"
#include "code\modules\assembly\timer.dm"
#include "code\modules\assembly\voice.dm"
Expand Down Expand Up @@ -2103,7 +2098,6 @@
#include "code\modules\mob\living\simple_animal\hostile\pirate.dm"
#include "code\modules\mob\living\simple_animal\hostile\russian.dm"
#include "code\modules\mob\living\simple_animal\hostile\stranger.dm"
#include "code\modules\mob\living\simple_animal\hostile\syndicate.dm"
#include "code\modules\mob\living\simple_animal\hostile\tree.dm"
#include "code\modules\mob\living\simple_animal\hostile\commanded\bear_companion.dm"
#include "code\modules\mob\living\simple_animal\hostile\commanded\commanded.dm"
Expand Down
4 changes: 0 additions & 4 deletions code/datums/autolathe/security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
name = "zip ties"
build_path = /obj/item/handcuffs/zipties

/datum/design/autolathe/sec/electropack
name = "electropack"
build_path = /obj/item/device/radio/electropack

/datum/design/autolathe/sec/binoculars
name = "binoculars"
build_path = /obj/item/device/binoculars
Expand Down
6 changes: 1 addition & 5 deletions code/datums/uplink/grenades.dm
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two blank lines?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whoops, would rather not do a commit purely for a single newline though.

Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,7 @@
item_cost = 10
path = /obj/item/storage/box/explosive

/datum/uplink_item/item/grenades/viscerator
name = "viscerator grenade"
item_cost = 5
path = /obj/item/grenade/spawnergrenade/manhacks


/datum/uplink_item/item/grenades/flash
name = "5xFlashbang Grenades"
item_cost = 5
Expand Down
Loading
Loading