Commit Graph

6385 Commits

Author SHA1 Message Date
Henri215
cb4a29037f Adds the trash bag of holding upgrade for janiborg (#20548) 2023-04-04 09:49:32 +01:00
Henri215
5f68e7835c Garment bag for the chaplain/warden/detective/iaa (#20515)
* Garment bag for the chaplain

* garment for detective and warden

* legal closet removal and garment bag for iaa
2023-03-27 20:41:37 +02:00
S34N
c8418fa1b2 sinew (#20718) 2023-03-26 13:59:53 +01:00
S34N
a65706a368 Fixes missing stacks, wonky ORM icons (#20717)
* oh god why

* lol TGUI rebuild
2023-03-26 13:16:21 +01:00
Alantodne
b6086b110a Buffs Mediborg abductor module to affect medihypo (#20471)
* Buffs Mediborg abductor module to affect medihypo

* Adds the missing space
2023-03-26 12:23:36 +01:00
Henri215
17a8b219c8 Adds new sounds when sweeping and mopping (#20550)
* Its mopping time

* GDN suggestion
2023-03-26 12:18:34 +01:00
Luc
6bf5172bec Fix SM (and some other) follow links (#20554)
* hoopefully fix SM message tracking being really weird

* update some more follow targets

* Apply suggestions from code review

hehe

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Cleans up some loose ends, implements for arrivals announcer too

* Changes target to the new deactivated core

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-03-26 12:17:37 +01:00
S34N
5ce5a66c81 Ports a load of Pigeonverde322 sprites from beestation (#20588)
* initial

* second

* MORE

* spelling

* more spelling, rods

* qwik mafs
2023-03-26 12:11:01 +01:00
Luc
d51d288ea7 Medical Wrench suicide now glows brightly (#20607)
* LET THERE BE LIGHT

* little flash for those around you as well

* Add vi3trice's changes
2023-03-26 12:07:34 +01:00
Adrer
d07f2138f2 Janiborgs can no longer use floor buffer for massive speedboost (#20581)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2023-03-26 12:06:14 +01:00
JimKil3
845c842f14 Renames Strange Reagent to Lazarus Reagent (#20614)
* the great renamining
also changes the description to be more flavorful

* capitalization
2023-03-26 12:04:02 +01:00
Henri215
c596e415de You can now sweep into janicarts trash bags (#20629)
* You can now sweep into janicarts trash bags

* farie review

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-03-25 13:38:49 +01:00
Burzah
996756dd01 Smuggler's satchel now fits in Bag of Holding (#20630)
* adds an override to storage_base.dm
allows for BOH to hold smugglers satchel

* formatting fix

* Update code/game/objects/items/weapons/storage/storage_base.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/storage_base.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/storage_base.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/storage_base.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/storage_base.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* small tweak after testing

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-03-25 08:07:33 +01:00
Samman166
5db00d7095 Stun batons and Stun prods that are turned on cannot be stored (#20303)
* active batons and stunprods cannot be stored

* now checks if baton was turned off by removing its cell or running out of charge

* won't fit in bags of holding now

* Update code/game/objects/items/weapons/stunbaton.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Reworked to not use weight class but instead can_store and mob_can_equip

* removed W_class_on var that I added, it's redundandt now that this does not use weight class

* Update code/game/objects/items/weapons/stunbaton.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/game/objects/items/weapons/stunbaton.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* disable_warning = TRUE

* Update code/game/objects/items/weapons/stunbaton.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-03-24 21:45:22 +01:00
Octus
a19e2cc4ef Freedom Implant is now 5 TC instead of 6 TC (#20425)
* ITS TOO EZ

* CMON MAN ITS TOO EZ
2023-03-23 11:38:17 +00:00
Henri215
5c9d20f65f Ports the Bluespace Light Replacer from BeeStation (#20545)
* Ports the Bluespace Light Replacer from BeeStation

* advanced replacer for janitor ERT

* wrong place

* Preventing it from being used over cameras

* Update code/game/objects/items/devices/lightreplacer.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* bluespace replacer only for gamma

---------

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2023-03-22 22:22:19 -05:00
GDN
a99f3effda fixes syndikey gc issues (#20653) 2023-03-22 19:00:57 -04:00
Coolrune206
48eb386e5c Donk Pocket Cooling 2: The Reworkening (#20453)
* donk pocket rework

* Snowball had a far more sensible way to do this

* lewcc review

* Sirryan review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* I fix?

* Revert "I fix?"

This reverts commit 1517d2e21e.

* please work you stupid .dmi

* WORK DAMN YOU

* will this hypothetically work

* re-adds syndie donk kit

* documented these

* just return

* clause guarded

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-03-20 14:26:06 -05:00
GDN
5557f6ae32 Nukes detailed examine (#20314)
* Nukes detailed examine, converts to normal examine stuff

* THE SHOOTENING

* Update code/game/objects/structures/grille.dm

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>

* oop

* Update code/modules/mob/living/silicon/robot/drone/maint_drone.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/power/apc/apc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/projectiles/guns/energy/nuclear.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* bam

---------

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-03-17 16:20:53 -05:00
Luc
eafe04f41f Pops up a little bubble when you're requesting a high-five, along with some other emotes (#20472)
* High five!

* Add in-hand use

* use in hand too

* closing remarks

* better looking

* Fixes daps

* grab my hand fat man

* hand shake

* Implement missed messages

* i can spell

* Update code/modules/mob/living/carbon/human/human_emote.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Review concerns

* Add some auto-doc, minor changes

* more cleverly handles pointing

* Update code/modules/point/point.dm

Path clarity

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-03-15 20:37:54 +01:00
GDN
19c4c00503 deletes some unused variables (#20609) 2023-03-13 18:32:36 -04:00
Burzah
30e461f60a Ert medic kit rework (#20561)
* First commit for ERT medic kit rework

* Value adjustment for pill bottles and patch pack
This was intended for the first commit

* removes the empty containers previously created

* Update code/game/objects/items/weapons/storage/firstaid.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/firstaid.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Merge conflict resolution

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-03-13 22:53:47 +01:00
Coolrune206
d19b04b036 Gives the Syndie Multitool an in-hand sprite (#20521)
* syndie multitool inhand

* .dmi conflicts moment AAAAAAAAA
2023-03-13 22:37:14 +01:00
Ryan
feef0ea814 Fixes Garbage Collection issues with Xenobiology (#20190)
* xenobio gc fixes

* requested changes

* requested changes
2023-03-08 20:42:44 +01:00
GDN
850acd85b3 improved admin logging for chembombs (#20498)
* improved admin logging for chembombs

* Update code/game/objects/items/weapons/grenades/chem_grenade.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/game/objects/items/weapons/grenades/chem_grenade.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-03-08 20:16:09 +01:00
GDN
626d2754d5 objective items being destroyed are now logged (#20485)
* objective items being destroyed is now logged

* signal time

* oop

* Update code/modules/projectiles/guns/energy/laser.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update code/game/objects/items/documents.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* mira review

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-03-08 20:15:16 +01:00
GDN
8ea96d8e36 Makes the armblade handle more like the fireaxe with opening doors (#20313)
* armblade tweaks

* mistaken regression

* farie's review

* early return

* Update code/game/machinery/doors/airlock.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-03-08 19:57:14 +01:00
GDN
dd47769567 combat defib tweaks, moved out of the medikit (#20379)
* moves the combat defib out of the first aid kit, tweaks both costs

* no more synthflesh patches

* i just a little stupid

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* we just a little stupid

* deletes stims, really not needed

webedit lol

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-03-06 23:47:00 -05:00
Vi3trice
a5d949a0e7 Why (#20514) 2023-03-04 15:29:33 +00:00
1080pCat
6b4feef831 Removes the RCD from engi borgs base kit, and replaces it with a module upgrade (#20449)
* be moved rcd!

* Minor grammar change ~contrabang

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* ert/emag borg get rcd & fixes issue GDN brought up

* Fixes an oversight with getting more than one rcd

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Remove space from rcd upgrade name

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-03-04 09:56:21 +01:00
Henri215
77b554b73e Deluxe soap for ERT (#20346)
* Elite soap for the best

* Reverting janiborg soap
2023-03-04 09:39:18 +01:00
Adrer
732914dda7 Refactors revolution code to be a little less of a mess (#20327)
* Refactors revolution code

* Ad comment to transit_z

* Add heads check to transit_z

* Rename parameter in transit_z

* Fix duplicate definition of latespawn

* Remove unused check_counter var

* Apply suggestions from code review from Sirryan2002

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Added early return to conversion proc

* Apply suggestions from code review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-03-04 09:22:23 +01:00
Christasmurf
330180c83e Dignitary drip - Magistrate, NT Rep, Blueshield (#20438)
* dignitary, human, items, spawning

* garment bag update

* dignitary icons

* ntrep cap

* gloves and hat fix

* dignitary icons part 2 and misc code

* minor stuff

* hat fix from updates also drask and grey suit slot

* minor description discrepancy

* cane resprite
2023-03-02 09:15:35 +00:00
Luc
90fbfb8d0c Fix shock sounds (#20457) 2023-02-27 11:01:32 -06:00
Henri215
e081a9976a Adds five new bible sprites (#20416)
* Fours new bibles and lib computer emag_act

* inhand sprites and moving bibles to new dmi file

* Clockwork bible

* Missing pixel from clock_bible
2023-02-27 10:52:07 -06:00
GDN
8eccdfcb19 fixes a highlander runtime and the highland MA not being assigned (#20409) 2023-02-27 10:34:13 -06:00
Henri215
1ce593b9a2 Ports TG push broom (#20367)
* Ports TG push broom

* Update code/game/objects/items/weapons/twohanded.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Lewc review and twohanded autodoc

* Steelslayer review

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-02-25 12:15:21 -06:00
HMBGERDO
e491aa9c2e Fiber Garrote now mutes all emotes when garroting target (#20393)
* added check for STATUS_EFFECT_SILENCED when we want to emit emote sound. If /mob/living has this flag, emote wont emit sound. Less ways to spam sounds when you supposed to be silent

* Revert "added check for STATUS_EFFECT_SILENCED when we want to emit emote sound. If /mob/living has this flag, emote wont emit sound. Less ways to spam sounds when you supposed to be silent"

This reverts commit bc093ba01f.

* new status effect absolute silence, applying when using fiber garrote to silence all emote sounds

* comments update, status set function standartisation

* Update code/datums/emote.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-02-25 01:12:56 -06:00
Henri215
f0bf051e4b Janitorial holosign projector tweaks (#20368) 2023-02-25 00:14:19 -06:00
BiancaWilkson
ceed4e89f9 Reworks the poison pen (#20353)
* paperwork so boring it kills you

* it's worth a bit more now

* Backup in case you poison yourself

* Virologist gets it, accurate description

* I promise im literate

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* No more charcoal, time for gloves

* Turns comments into auto-doc

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-02-25 00:08:40 -06:00
Luc
bcc6b4c24a Putting nerds to bed (#20436)
* and here's the sleeper

* Client-less animals sleep for longer

* Fixes sleep length

* never mind, animals can't be pushed :(

* pronounce

* Ensure they aren't already sleeping

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

---------

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2023-02-21 22:16:05 +00:00
Coolrune206
5a94bb7551 yeah, no (#20424) 2023-02-17 22:35:07 +00:00
1080pCat
c75f5d1f6c Changes the fluffy cuffs description to not mention keeping your SO in line.. (#20428)
* goofy ah

* minor spelling error :(
2023-02-17 22:33:54 +00:00
1080pCat
b8c12bbbf7 more medborg love (#20332) 2023-02-16 21:06:23 +01:00
Samman166
f915a1d614 Removes smoke cluster grenades (#20331)
* Removes smoke cluster grenades

* removes regular hellwater grenades
2023-02-15 21:17:35 +01:00
GDN
f567da369b deletes the forcesay() proc fixing tyder wizards getting murderized (#20398)
* deletes forcesay

* removes hit_appends fully
2023-02-15 20:55:50 +01:00
Vi3trice
f428cee612 Adds the cash register (#20138)
* You asked

* Tweaks

* Update eftpos.dm

* Adding registers

* good luck meta you'll need it

* Update eftpos.dm

* More sounds

* More sounds, you can pay as long as you're close to the register.

* Tone down the edits, chefs will figure it out

* tim allen grunt

* Update eftpos.dm

* Update eftpos.dm

* Update code/modules/economy/economy_machinery/eftpos.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Ceres is a thing now

* Fix merge

* Update eftpos.dm

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-02-14 10:14:10 +00:00
warriorstar-orion
a7bd9d6bde Whitespace fixes, final part (hopefully) (#20361) 2023-02-13 11:49:28 -06:00
Henri215
42d1758b2e Fixing common spelling mistakes part 2 (#20360)
* Fixing common spelling mistakes part 2

* "supressed"
2023-02-08 21:20:35 +01:00
Qwertytoforty
e40ef20c86 Pizza bombs can no longer be told apart, some pizza improvements (#20191)
* pizza time

* a batch of delicous pizza fixes mama mia

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* bool

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* steels changes

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-02-08 13:07:36 -06:00