+
24 December 2018
+
Alffd updated:
+
+ - Removed fart based mechanics.
+
+
Ty-Omaha updated:
+
+ - Removes "name here" from PR template
+
+
datlo updated:
+
+ - Added the grenadier belt for nukies, ported from tg, containing a LOT of various grenades to throw at people.
+ - Added the gluon grenade (Freeze floors and irradiate) and the frag grenade.
+ - Added Toxins tech to RND. Can only be improved by testing explosives in the toxins lab, and unlocks various atmospherics tanks and items in the protolathe.
+ - Added the Bluespace Rapid Pipe Dispenser, allowing you to place pipes at a distance. Built in the protolathe after improving Toxins and Bluespace tech. Sprite made by Ionward.
+ - Welding Gas Mask now requires toxins tech.
+ - Syndicate Officer job now available for admins, along with a brand new office connecting to the SIT, SST, and nuke ops ready room.
+ - Remapped SIT and SST starting areas to be next to nuke ops starting area. Added sleepers and a couple of other QOL stuff in their ready rooms
+ - Added a holding cell to the SIT starting area
+ - Added a teleporter available to SIT and SST if admin enables it, can go to and from the z2 area.
+ - Added an armory SST can get if admin enables it. 2 bulldogs, 2 SMG, 1 sniper, 1 medigun, 1 rocket launcher and assorted ammo.
+ - Added 3 dark gygaxes, tools, and welding fuel to the SST mechbay room (admin access required)
+ - Added a new subtype of mech rechargers for CC zlevel that will always recharge an attached mech even without power/recharger monitor
+ - Added SIT shuttle transit area
+
+
v0idp updated:
+
+ - Syndicate Officer won't show in nt recruitment anymore
+
+
+
19 December 2018
+
Citinited updated:
+
+ - Fixes a bug preventing snow machine crates from being orderable at roundstart. Ho ho ho!
+
+
uc_guy updated:
+
+ - Fixed anomalies being disabled by random radio traffic.
+
+
+
18 December 2018
+
Citinited updated:
+
+ - Adds the snow machine. Fill it up with water, turn it on, and watch it create a winter wonderland all on its own! For best results set your room's air alarm to the lowest value it can go to.
+ - The snow machine is orderable from cargo during Christmas time.
+ - You can use a shovel to clear away generated snow. Scrooge.
+
+
FreeStylaLT updated:
+
+
Ionward updated:
+
+ - updated santa hat sprite, use hat to toggle beard
+
+
Tails2091 updated:
+
+ - Fixes vent crawl vision sticking around for simple_animals.
+
+
datlo updated:
+
+ - Added a global cap on printing papers.
+
+
+
17 December 2018
+
MarsM0nd updated:
+
+ - Restores mech radial menu functionality.
+
+
+
15 December 2018
+
MarsM0nd updated:
+
+ - radial menu now works for normally implanted implants
+
+
datlo updated:
+
+ - Added sprites to specie specific boxes made by shazbot
+
+
uraniummeltdown updated:
+
+ - Me button added to chatbar
+
+
13 December 2018
+
Breenland updated:
+
+ - Adds drask ability to have auto-accent.
+
+
Edefff updated:
+
+ - increase rollie smoketime to accommodate new chem volume
+
+
Kyep updated:
+
+ - Tweaked the syndicate depot to fix various bugs and unintended design things, as well as make some changes to improve fun value.
+ - Computer and machine frames are no longer invincible, and can now be destroyed by hostile NPCs.
+
McDonald072 updated:
- Fixed being unable to cast lightning with the action button.
+
Mitchs98 updated:
+
+ - Add's Makiroll's! Larger sliceable variants of sushi that yield four rolls of sushi in the same time that it previously took for one. You can also eat the Makiroll itself for 4x the nutriment/protein of a regular roll of sushi. Requires the Sushi Mat to craft.
+ - Add's the Sushi Mat. 3 start in the chef's vendor. New ones craftable with 5 wood and 5 cable coil.
+
+
Shadow-Quill updated:
+
+ - Makes people who are miming/mute give a visible indicator of their communion.
+
+
Tails2091 updated:
+
+ - trimmed 300ms delay from smash.ogg
+
+
datlo updated:
+
+ - Removed access requirement on emagged fax machines
+
12 December 2018
Kyep updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index cd272b7eacb..1adf6123888 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -8351,5 +8351,89 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
name here:
- bugfix: Fixed Bulldog and C20 having their ammo alarms only go off once per gun.
2018-12-13:
+ Breenland:
+ - rscadd: Adds drask ability to have auto-accent.
+ Edefff:
+ - bugfix: increase rollie smoketime to accommodate new chem volume
+ Kyep:
+ - tweak: Tweaked the syndicate depot to fix various bugs and unintended design things,
+ as well as make some changes to improve fun value.
+ - bugfix: Computer and machine frames are no longer invincible, and can now be destroyed
+ by hostile NPCs.
McDonald072:
- bugfix: Fixed being unable to cast lightning with the action button.
+ Mitchs98:
+ - rscadd: Add's Makiroll's! Larger sliceable variants of sushi that yield four rolls
+ of sushi in the same time that it previously took for one. You can also eat
+ the Makiroll itself for 4x the nutriment/protein of a regular roll of sushi.
+ Requires the Sushi Mat to craft.
+ - rscadd: Add's the Sushi Mat. 3 start in the chef's vendor. New ones craftable
+ with 5 wood and 5 cable coil.
+ Shadow-Quill:
+ - tweak: Makes people who are miming/mute give a visible indicator of their communion.
+ Tails2091:
+ - soundadd: trimmed 300ms delay from smash.ogg
+ datlo:
+ - tweak: Removed access requirement on emagged fax machines
+2018-12-15:
+ MarsM0nd:
+ - bugfix: radial menu now works for normally implanted implants
+ datlo:
+ - rscadd: Added sprites to specie specific boxes made by shazbot
+ uraniummeltdown:
+ - rscadd: Me button added to chatbar
+2018-12-17:
+ MarsM0nd:
+ - bugfix: Restores mech radial menu functionality.
+2018-12-18:
+ Citinited:
+ - rscadd: Adds the snow machine. Fill it up with water, turn it on, and watch it
+ create a winter wonderland all on its own! For best results set your room's
+ air alarm to the lowest value it can go to.
+ - rscadd: The snow machine is orderable from cargo during Christmas time.
+ - tweak: You can use a shovel to clear away generated snow. Scrooge.
+ FreeStylaLT:
+ - rscadd: Christmas!
+ Ionward:
+ - tweak: updated santa hat sprite, use hat to toggle beard
+ Tails2091:
+ - bugfix: Fixes vent crawl vision sticking around for simple_animals.
+ datlo:
+ - bugfix: Added a global cap on printing papers.
+2018-12-19:
+ Citinited:
+ - bugfix: Fixes a bug preventing snow machine crates from being orderable at roundstart.
+ Ho ho ho!
+ uc_guy:
+ - bugfix: Fixed anomalies being disabled by random radio traffic.
+2018-12-24:
+ Alffd:
+ - rscdel: Removed fart based mechanics.
+ Ty-Omaha:
+ - rscdel: Removes "name here" from PR template
+ datlo:
+ - rscadd: Added the grenadier belt for nukies, ported from tg, containing a LOT
+ of various grenades to throw at people.
+ - rscadd: Added the gluon grenade (Freeze floors and irradiate) and the frag grenade.
+ - rscadd: Added Toxins tech to RND. Can only be improved by testing explosives in
+ the toxins lab, and unlocks various atmospherics tanks and items in the protolathe.
+ - rscadd: Added the Bluespace Rapid Pipe Dispenser, allowing you to place pipes
+ at a distance. Built in the protolathe after improving Toxins and Bluespace
+ tech. Sprite made by Ionward.
+ - tweak: Welding Gas Mask now requires toxins tech.
+ - rscadd: Syndicate Officer job now available for admins, along with a brand new
+ office connecting to the SIT, SST, and nuke ops ready room.
+ - tweak: Remapped SIT and SST starting areas to be next to nuke ops starting area.
+ Added sleepers and a couple of other QOL stuff in their ready rooms
+ - rscadd: Added a holding cell to the SIT starting area
+ - rscadd: Added a teleporter available to SIT and SST if admin enables it, can go
+ to and from the z2 area.
+ - rscadd: Added an armory SST can get if admin enables it. 2 bulldogs, 2 SMG, 1
+ sniper, 1 medigun, 1 rocket launcher and assorted ammo.
+ - rscadd: Added 3 dark gygaxes, tools, and welding fuel to the SST mechbay room
+ (admin access required)
+ - bugfix: Added a new subtype of mech rechargers for CC zlevel that will always
+ recharge an attached mech even without power/recharger monitor
+ - bugfix: Added SIT shuttle transit area
+ v0idp:
+ - bugfix: Syndicate Officer won't show in nt recruitment anymore
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 060d8b77a27..95099bb00f3 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/effects/tear.dmi b/icons/effects/tear.dmi
index 305b63bcb0c..db544043ed0 100644
Binary files a/icons/effects/tear.dmi and b/icons/effects/tear.dmi differ
diff --git a/icons/effects/water.dmi b/icons/effects/water.dmi
index 1bccfad7773..f0368e72852 100644
Binary files a/icons/effects/water.dmi and b/icons/effects/water.dmi differ
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index 54b8024f58e..7af0db53ef0 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index b5444b2ff87..46bdbf8a92c 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
index b40ca75991e..fd5fe11157e 100644
Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
index cd2ed068568..83d5e0b5007 100644
Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 3d7ae0a4fb4..0f6ff11258b 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index a7ac19a5a6c..94609f65f00 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/species/drask/helmet.dmi b/icons/mob/species/drask/helmet.dmi
index f3c683d8fdf..4ba9ca88b2c 100644
Binary files a/icons/mob/species/drask/helmet.dmi and b/icons/mob/species/drask/helmet.dmi differ
diff --git a/icons/mob/species/grey/head.dmi b/icons/mob/species/grey/head.dmi
index 5f0a6d25ced..1b1dce84a9c 100644
Binary files a/icons/mob/species/grey/head.dmi and b/icons/mob/species/grey/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 7ffa0461742..67fb3a98a65 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 5166e198e64..99abc67ac44 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index 2603a655bff..8c124230708 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/obj/food/seafood.dmi b/icons/obj/food/seafood.dmi
index af4035efd0d..279fa9c4571 100644
Binary files a/icons/obj/food/seafood.dmi and b/icons/obj/food/seafood.dmi differ
diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi
index be866dc4275..e1b2164a39a 100644
Binary files a/icons/obj/grenade.dmi and b/icons/obj/grenade.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 9284e790cf8..07680638b6b 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index 3bbc5618967..16fb7801f0f 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/icons/obj/shards.dmi b/icons/obj/shards.dmi
index 5ce7113bf88..20927b8dd79 100644
Binary files a/icons/obj/shards.dmi and b/icons/obj/shards.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index 0b7ae5b5600..c8a9abd40f3 100755
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 65e0655df21..018a4d3f536 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index 1111dfb02ee..7ff4d229863 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 9435f531e06..ab8e7ef370c 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -1557,7 +1557,7 @@ window "mainwindow"
elem "input"
type = INPUT
pos = 3,420
- size = 517x20
+ size = 477x20
anchor1 = 0,100
anchor2 = 100,100
is-default = true
@@ -1577,9 +1577,19 @@ window "mainwindow"
anchor2 = none
is-flat = false
text = "Chat"
- command = ".winset \"saybutton.is-checked=true?input.command=\"!say \\\"\" macrobutton.is-checked=false:input.command=\""
+ command = ".winset \"saybutton.is-checked=true?input.command=\"!say \\\"\" macrobutton.is-checked=false:input.command=\"\"saybutton.is-checked=true?mebutton.is-checked=false\""
is-checked = false
saved-params = "is-checked"
+ elem "mebutton"
+ type = BUTTON
+ pos = 480,420
+ size = 40x20
+ anchor1 = 100,100
+ anchor2 = none
+ saved-params = "is-checked"
+ text = "Me"
+ command = ".winset \"mebutton.is-checked=true?input.command=\"!me \\\"\" macrobutton.is-checked=false:input.command=\"\"mebutton.is-checked=true?saybutton.is-checked=false\""
+ button-type = pushbox
elem "tooltip"
type = BROWSER
pos = 0,0
diff --git a/nano/templates/doppler_array.tmpl b/nano/templates/doppler_array.tmpl
index d3bb40744b2..5747cd847a2 100644
--- a/nano/templates/doppler_array.tmpl
+++ b/nano/templates/doppler_array.tmpl
@@ -1,3 +1,5 @@
+
Shift's target : {{:data.explosion_target}}
+
Current Technology Level : {{:data.toxins_tech}}
Logged explosions:
{{if data.explosion_data == 0}}
No explosions logged this shift.
diff --git a/paradise.dme b/paradise.dme
index 2561dc94410..a2e96d73ddf 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"
@@ -611,6 +612,7 @@
#include "code\game\machinery\shieldgen.dm"
#include "code\game\machinery\Sleeper.dm"
#include "code\game\machinery\slotmachine.dm"
+#include "code\game\machinery\snow_machine.dm"
#include "code\game\machinery\spaceheater.dm"
#include "code\game\machinery\status_display.dm"
#include "code\game\machinery\suit_storage_unit.dm"
@@ -746,6 +748,7 @@
#include "code\game\objects\effects\misc.dm"
#include "code\game\objects\effects\overlays.dm"
#include "code\game\objects\effects\portals.dm"
+#include "code\game\objects\effects\snowcloud.dm"
#include "code\game\objects\effects\spiders.dm"
#include "code\game\objects\effects\step_triggers.dm"
#include "code\game\objects\effects\decals\cleanable.dm"
@@ -923,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"
@@ -1405,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/sound/weapons/smash.ogg b/sound/weapons/smash.ogg
index ba76cf89e6f..c4637e285d3 100644
Binary files a/sound/weapons/smash.ogg and b/sound/weapons/smash.ogg 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",