Commit Graph

1074 Commits

Author SHA1 Message Date
BlackMajor
4b8b03fea0 Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled. 2021-01-05 16:32:02 -03:00
QuoteFox
78427df75f Food icons, and some custom ones
Food icons, (mainly ports from Eris, they do amazing work over there with their sprite work), and some custom ones I made myself with similar colour pallets. Also makes synth meat less attractive.
2021-01-05 13:20:54 +00:00
Archie
10e74b643e Fix scanners.dm conflict 2021-01-05 03:31:28 -03:00
QuoteFox
bb83dfc24f Merge pull request #823 from ArchieBeepBoop/morereagentfixesyeeeet
More reagent bullshit fixes YEEEEET
2021-01-05 06:21:13 +00:00
Lin
b0779fe2d7 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2021-01-05 01:34:16 -03:00
Ghom
dc7c1aca91 Merge pull request #10538 from Putnam3145/chemistry-aaa
Fixes to chemistry
2021-01-04 21:26:29 -03:00
Putnam3145
0b39a4986c Merge pull request #10532 from Ghommie/Ghommie-cit503
A few reagents related fixes.
2021-01-04 21:23:36 -03:00
Archie
0fba3d15e1 scannerfix 2021-01-04 21:22:21 -03:00
kevinz000
7f2de64be7 RCD Update Sync 2021-01-04 18:13:02 -03:00
QuoteFox
0699c90a50 Merge pull request #814 from VladinXXV/blueshield
Paramed uniforms aren't invisible on digi anymore/adds premium secdrobe option "blueshield"
2021-01-04 16:09:20 +00:00
QuoteFox
26bc758558 Merge pull request #817 from ArchieBeepBoop/glass
Deletes two reagent logging runtimes
2021-01-04 16:08:59 +00:00
Archie
ea58ef76b1 painkiller and pina colada fix 2021-01-04 04:01:14 -03:00
Archie
3dde862df2 Delete runtimes 2021-01-04 03:02:42 -03:00
QuoteFox
481eb021cc Merge pull request #816 from ArchieBeepBoop/disky
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work"
2021-01-04 05:42:09 +00:00
QuoteFox
4d164c0b5b Merge pull request #813 from ArchieBeepBoop/thalpyyyyy
Updates our Fermichems, fixes synthtissue.
2021-01-04 05:41:29 +00:00
QuoteFox
3484561d38 Merge pull request #815 from ArchieBeepBoop/keybindings
Unmodularize Keybinds pt1
2021-01-04 05:41:11 +00:00
Lin
5dd1bc07c6 Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly 2021-01-04 02:36:28 -03:00
kevinz000
21cbe5095a Merge pull request #10356 from deathride58/sprintprefs
Adds space to sprint and toggle sprint as preferences
2021-01-04 01:51:21 -03:00
kevinz000
00a753d632 Merge pull request #9817 from Ghommie/Ghommie-cit357
Fixing a keybinding issue.
2021-01-04 01:49:46 -03:00
QuoteFox
68c6277ee8 Remove radio in
say.dm is fucked and makes no sense.
2021-01-04 04:35:28 +00:00
Lin
6810aa0a94 Merge pull request #10214 from Ghommie/Ghommie-cit472
Brings carbon action intent hotkeys down to living.
2021-01-04 01:31:40 -03:00
kevinz000
ca55e5f8b0 Merge pull request #9804 from Ghommie/Ghommie-cit351
Unmodularize keybindings.
2021-01-04 01:31:17 -03:00
Vladin
a7ee5f4ce0 requiem
uniform no longer awkwardly caps and shit added to vendor
2021-01-03 20:10:09 -05:00
Vladin
ec989eefe0 Revert "Revert "fucking digi""
This reverts commit 31dc2dceeb.
2021-01-03 19:41:47 -05:00
Vladin
31dc2dceeb Revert "fucking digi"
This reverts commit 5c737c6c1e.
2021-01-03 19:37:12 -05:00
Vladin
5c737c6c1e fucking digi
this should fix the bs coat for digi
2021-01-03 19:33:58 -05:00
Vladin
03e081662c fucking seclites
i knew it was too good to be true
2021-01-03 19:23:18 -05:00
Vladin
1965387bea Blueshield Shit
adds blueshield uniform and coat. also should fix paramedic uniforms.
2021-01-03 19:19:16 -05:00
Archie
97fc5821d7 Synthtissue fix (Thanks to Fermi! <3) 2021-01-03 16:54:22 -03:00
Archie
622a6232b0 Chem master analyze fix, synthtissue update 2021-01-03 07:15:51 -03:00
Archie
efb7bc7b45 Updates reagent holder code 2021-01-03 06:00:13 -03:00
kevinz000
2c11b68f2f Fixes chemscan 2021-01-03 05:56:28 -03:00
kevinz000
cf95f0f7b1 Merge pull request #9377 from Thalpy/Fixes_melting_grenades
[Mild urgency] Fixes melting cleaning grenades found in janitor/cargoboxes.
2021-01-03 05:39:20 -03:00
kevinz000
b36aeba681 oops 2021-01-03 05:38:49 -03:00
kevinz000
14fd28eb84 Allows syringe/dropper use on beakers in heaters. 2021-01-03 05:38:02 -03:00
kevinz000
58d0049f31 Adds a markdown parse of all chems for use with github wiki to debug menu. 2021-01-03 05:30:16 -03:00
kevinz000
d98a3dd23c Fixes analyse function on ChemMasters to correctly display purity and fixes the custom transfer for buffer to beaker button. 2021-01-03 05:27:30 -03:00
kevinz000
12c8ebea11 Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite. 2021-01-03 05:21:47 -03:00
kevinz000
8e1effc3e4 Partially fixes tiny runaway decimals in reagents. 2021-01-03 05:04:47 -03:00
kevinz000
ee082f200e Fermi1 2021-01-03 05:00:57 -03:00
QuoteFox
6ef789e343 Merge pull request #805 from ArchieBeepBoop/updates
Robustin's Syndicate Infiltrator PR from tee-gee
2021-01-03 05:43:35 +00:00
QuoteFox
ff20e5077b Merge pull request #808 from DragonTrance/catnip-mood-boost
Gives Catnip a Mood Boost to felinids
2021-01-03 05:41:24 +00:00
QuoteFox
86e0d7fb1b Merge pull request #809 from ArchieBeepBoop/stuff
Surgery fix package
2021-01-03 05:40:43 +00:00
QuoteFox
5dae3ac577 Merge pull request #812 from ArchieBeepBoop/slamupgrade
Upgrades Tabletide Stationwide
2021-01-03 05:35:25 +00:00
Archie
c379fcd322 Upgrades Tabletide Stationwide 2021-01-03 02:34:11 -03:00
Archie
222d37751e Fixes blood and properly adds the char reagent to grilled items as well (you can overdose on it) 2021-01-03 01:58:45 -03:00
kevinz000
b21c65055a Surgery fix package 2021-01-02 19:03:45 -03:00
kevinz000
8e51c88d0e Porting Robustin's Syndicate Infiltrator PR from tee-gee 2021-01-02 16:53:52 -03:00
QuoteFox
092a7fa5a1 Merge pull request #804 from quotefox/sexhud
New HTML arousal hud, with contextal options, plus new lewd features.
2021-01-02 14:34:31 +00:00
QuoteFox
a9575ffc21 Merge pull request #794 from lyricalpaws/master
Let synthliz and IPC have and be infected by nanites
2021-01-02 14:02:24 +00:00