No explosions logged this shift.
diff --git a/paradise.dme b/paradise.dme index fcc4aa9c054..48290761e6a 100644 --- a/paradise.dme +++ b/paradise.dme @@ -562,6 +562,7 @@ #include "code\game\jobs\job\supervisor.dm" #include "code\game\jobs\job\support.dm" #include "code\game\jobs\job\support_chaplain.dm" +#include "code\game\jobs\job\syndicate.dm" #include "code\game\jobs\job_objectives\science.dm" #include "code\game\machinery\adv_med.dm" #include "code\game\machinery\ai_slipper.dm" @@ -925,6 +926,7 @@ #include "code\game\objects\items\weapons\grenades\custom_grenades.dm" #include "code\game\objects\items\weapons\grenades\emgrenade.dm" #include "code\game\objects\items\weapons\grenades\flashbang.dm" +#include "code\game\objects\items\weapons\grenades\frag.dm" #include "code\game\objects\items\weapons\grenades\ghettobomb.dm" #include "code\game\objects\items\weapons\grenades\grenade.dm" #include "code\game\objects\items\weapons\grenades\smokebomb.dm" @@ -1407,6 +1409,7 @@ #include "code\modules\events\spider_terror.dm" #include "code\modules\events\spontaneous_appendicitis.dm" #include "code\modules\events\tear.dm" +#include "code\modules\events\tear_honk.dm" #include "code\modules\events\traders.dm" #include "code\modules\events\undead.dm" #include "code\modules\events\vent_clog.dm" diff --git a/sound/effects/fart.ogg b/sound/effects/fart.ogg deleted file mode 100644 index a0ce30c9240..00000000000 Binary files a/sound/effects/fart.ogg and /dev/null differ diff --git a/sound/goonstation/effects/superfart.ogg b/sound/goonstation/effects/superfart.ogg deleted file mode 100644 index 8a83fa7c64a..00000000000 Binary files a/sound/goonstation/effects/superfart.ogg and /dev/null differ diff --git a/strings/chemistry_tools.json b/strings/chemistry_tools.json index 28bfe60010b..4a079102a69 100644 --- a/strings/chemistry_tools.json +++ b/strings/chemistry_tools.json @@ -51,7 +51,6 @@ "evil", "exo", "exotic", - "farty", "flux", "flying", "freak", @@ -471,4 +470,4 @@ "concentrated_initro", "heartworms" ] -} \ No newline at end of file +} diff --git a/strings/ion_laws.json b/strings/ion_laws.json index ecb4660ded5..5a4d518d7e5 100644 --- a/strings/ion_laws.json +++ b/strings/ion_laws.json @@ -131,8 +131,6 @@ "OPAQUE", "GLOWING", "SHAKING", - "FARTING", - "POOPING", "BOUNCING", "COMMITTED", "MASKED", @@ -426,7 +424,6 @@ "A REPAIRMAN", "BILL NYE THE SCIENCE GUY", "RAINBOWS", - "A PET UNICORN THAT FARTS ICING", "THUNDERCATS HO", "AN ARMY OF SPIDERS", "GODDAMN FUCKING PIECE OF SHIT ASSHOLE BITCH-CHRISTING CUNTSMUGGLING SWEARING", @@ -603,7 +600,6 @@ "IGNORE THE CLOWN", "IGNORE THE CAPTAIN", "IGNORE ASSISTANTS", - "MAKE FART NOISES", "TALK ABOUT FOOD", "TALK ABOUT SEX", "TALK ABOUT YOUR DAY",