Commit Graph

1627 Commits

Author SHA1 Message Date
kevinz000 b5fe141a49 Supply Pod Code Update 2021-01-14 14:31:35 -03:00
QuoteFox d18c8a2f0f Merge pull request #873 from ArchieBeepBoop/rookieproblem
Rookie traitor fix?
2021-01-14 00:57:37 +00:00
QuoteFox b741e9a3cd Merge pull request #872 from ArchieBeepBoop/hidekey
Hide Ckey on Roundend Pref
2021-01-14 00:57:16 +00:00
QuoteFox f25b944d05 Merge pull request #865 from ArchieBeepBoop/boommouse
The boommouse beckons
2021-01-14 00:55:54 +00:00
QuoteFox 0e9d02be0e Merge pull request #863 from ArchieBeepBoop/carperoni
Sleeping Carp Hallucination + Fixes meteor hallucination
2021-01-14 00:55:42 +00:00
Archie 3aabe7d663 Rookie traitor fix? 2021-01-13 16:43:00 -03:00
Archie c7d78a3d40 Hide key v1 2021-01-13 16:22:56 -03:00
QuoteFox dd8e36f425 Merge pull request #864 from VladinXXV/ninjashoes
Makes ninja shoes visible on people again
2021-01-13 14:56:02 +00:00
QuoteFox 9817e42ce2 Merge pull request #869 from ArchieBeepBoop/lipooverdose
Lipolicide Overdose
2021-01-13 14:55:29 +00:00
Archie 6c2c720baa Loss of nutrition on vomit + 1% prob of burning you. 2021-01-13 01:48:18 -03:00
Archie 91c103e0aa lipolicide overdose 2021-01-13 01:42:37 -03:00
kevinz000 a633078eaa Merge pull request #11071 from Citadel-Station-13/Ghommie-patch-1
Something about disposal bins and trash bags.
2021-01-13 01:24:29 -03:00
Archie 7d19680fc3 remove log, typo 2021-01-12 22:57:53 -03:00
Archie ebee3bae26 The boom mouse beckons 2021-01-12 22:56:17 -03:00
Vladin b0d744e728 i quit
fuck you whoever did this
2021-01-12 19:35:46 -05:00
Archie e44bb36826 Uses our warning time 2021-01-12 21:00:49 -03:00
Archie 50b1f84a8b Sleeping Carp Hallucination + Fixes meteor hallucination 2021-01-12 20:57:37 -03:00
QuoteFox 315018241d Merge pull request #858 from TotallyNotADog/newRadsuit
New Radiation Suit Sprites
2021-01-12 18:41:51 +00:00
QuoteFox 2dbf476df7 Merge pull request #859 from CapnMachaddish/numbers-in-names-reloaded
You can now have numerals in your name again
2021-01-12 18:41:37 +00:00
CapnMachaddish 157c3722ac no longer shitcode 2021-01-12 00:59:24 -06:00
Chemlight 358fb00492 Fixing personal code
Darn it with these /datum/ changes
2021-01-11 20:46:10 -08:00
CapnMachaddish c79f3a38bc I hope this doesn't break things 2021-01-11 18:10:56 -06:00
TotallyNotADog 4bee682e2c rad sprots 2021-01-10 18:03:10 -06:00
QuoteFox 94aead92a3 Merge pull request #857 from ArchieBeepBoop/twitchplays
I'm a hazard to this community: Twitch Plays Clown Car port
2021-01-10 23:01:18 +00:00
DeltaFire 2b79e974eb Merge pull request #13909 from silicons/twitch_plays
Twitch Plays: Clown Car
2021-01-10 14:03:51 -03:00
Archie e33f08abbd Adds some more because why not? 2021-01-10 12:44:04 -03:00
Archie 99fa403e5d Fixes cryo announcements 2021-01-10 12:28:10 -03:00
Archie 80d37a88ae Fixes ghost role text all around 2021-01-10 12:13:31 -03:00
QuoteFox 1caa8b1baa Merge pull request #854 from ArchieBeepBoop/atmoslove
Ports 4 Atmos Related PRs from Cit
2021-01-10 11:32:31 +00:00
QuoteFox 046cc96cbc Merge pull request #852 from ArchieBeepBoop/nukesbluespacethread
Nukes bluespace thread
2021-01-10 11:31:36 +00:00
kevinz000 123d482898 micro opt 2021-01-10 04:29:48 -03:00
kevinz000 287db94b72 Merge pull request #10900 from Putnam3145/port-atmos-fix
Ports atmos priority reaction mix from TG
2021-01-10 04:21:42 -03:00
kevinz000 13607df1a9 Merge pull request #9836 from Ghommie/Ghommie-cit364
Ports "Uses defines for turf atmos"
2021-01-10 04:21:09 -03:00
Archie c6466270e7 Nukes bluespace thread 2021-01-09 19:40:17 -03:00
Archie f6a60bc8fd Updates chem_dispenser, fixes roundstart high tier upgrade soda dispensers 2021-01-09 18:05:14 -03:00
Archie 337f7d856b there we fucking go 2021-01-09 17:42:01 -03:00
Archie 881a876c24 Pills fixed, but doesn't refresh 2021-01-09 17:02:38 -03:00
Archie 5613768c25 haha chem master go brrrr 2021-01-09 16:01:21 -03:00
Ghom bfe9fa745c Merge pull request #11044 from Arturlang/TGUI_Next_Uplink
TGUI Next Uplinks
2021-01-09 15:35:32 -03:00
kevinz000 ec5e8eea05 Merge pull request #11681 from PersianXerxes/medicalTGUINext
TGUI Next in the Medbay
2021-01-09 15:27:10 -03:00
QuoteFox a875b9ffa7 condoms now fit in wallets.
condoms now fit in wallets.
2021-01-09 16:33:44 +00:00
QuoteFox c60a23ec15 Bug fix subtle
Subtle would spit out a number instead of your actual text, this is fixed.
2021-01-09 15:03:34 +00:00
QuoteFox 56320224ba fixes emoting with "*"
fixes emoting with "*"
2021-01-09 13:18:47 +00:00
Archie ee25835e3d I am stupid 2021-01-08 21:27:50 -03:00
Archie 2b9eec42e7 Traitorfix 2021-01-08 21:10:56 -03:00
Archie 65c316b35d ID + Hex Color Sanity Fixes 2021-01-08 19:45:07 -03:00
Archie cd18b82983 Merge remote-tracking branch 'upstream/master' into nexties2 2021-01-08 17:50:11 -03:00
Archie 6d7f77579c Admeme rank formatting, maybe? Byond 513 issue? 2021-01-08 17:05:17 -03:00
Archie 87ce4d858c Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""
This reverts commit 08c8f744a9.
2021-01-08 17:03:24 -03:00
QuoteFox 08c8f744a9 Revert "Merge pull request #838 from ArchieBeepBoop/test1"
This reverts commit b0dbacee82, reversing
changes made to 813a2ea1c7.
2021-01-08 19:28:18 +00:00