* Tweaks to greed ruin and die of fate
* Delay between effects
* moved and updaated traitor items
* More tweaks to traitor item list
* Update code/game/objects/items/weapons/dice.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Sirryan review
* Lets decrease the money even more
* experimental KA instead of alien pistol
* emp dmg for machines when interacting
* brainloss
* Code improvment
* forcewall removal
* Turning into a list
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Custom USSP roles for admins
* Added the sprites for new USSP
* conflict part 2
* Elder Gods please make this work
* new style for soviet box
* Added Soviet headset
* lets fix this conflict
* Die conflict!
* Sirryan review
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Lets solve this conflict
* Die conflict!
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* heh, almost made me use ten percent of my power
* appeasing the GC gods (GDN)
* hee hoo
* Update code/modules/martial_arts/cqc.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Update code/game/objects/items/hand_item.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* more return styling
* Update code/modules/martial_arts/cqc.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* no more wrapper
* the extent of my spriting skills
* fixes double slap sound
* slap emote also works
* try to remember the advanced lessons of CQC
* i hope this fixes the merge conflict
* Chefs are no longer perma-combat trained
* Chef CQC now uses signals to activate parrying
* Makes it easier to add it to other martial arts
* resolving merge conflict from ParadiseSS13#20620
* Revert "resolving merge conflict from ParadiseSS13#20620"
This reverts commit 30ea29a6a8.
* Revert "try to remember the advanced lessons of CQC"
This reverts commit e8daeb4d1a.
* try to not conflict the basics of CQC
* Update code/modules/martial_arts/cqc.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Update code/modules/martial_arts/cqc.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* lol, lmao even
* GDN was right, this is funny
* Update code/modules/martial_arts/cqc.dm
farie review pt. 1
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* Update code/modules/martial_arts/martial.dm
farie review pt. 2
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* Update code/modules/mob/living/carbon/human/human_emote.dm
farie review pt. 3
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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
