Commit Graph

1611 Commits

Author SHA1 Message Date
Archie
91c103e0aa lipolicide overdose 2021-01-13 01:42: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
Archie
c164b52b30 Merge remote-tracking branch 'upstream/master' into nexties2 2021-01-08 15:20:47 -03:00
QuoteFox
f1fbb326f9 Merge pull request #839 from Chemlight/I-Want-Easier-Less-Than-Lethal-Traitor
Syndicate Less Than Lethal option
2021-01-08 18:04:45 +00:00
Chemlight
b329c46061 Syndicate Lesss Then Lethal option
Thought I'd provide a better way on how to approach doing a maroon objective or rather theft antag related stuff. lately I've been seeing a lot of traitors go with the more lethal option for insurance.
2021-01-08 05:52:01 -08:00
Archie
9fc02e6cde Goonchat Update 2021-01-08 07:50:51 -03:00
Archie
78da9a5a12 Merge branch, update to current 2021-01-08 07:26:35 -03:00
kevinz000
939d8258de Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2021-01-08 07:11:56 -03:00
QuoteFox
99bf504191 Merge pull request #837 from ArchieBeepBoop/borgos
Updates the atrocious borg sleeper code, allows them to unbuckle people from themselves and objects
2021-01-08 09:01:28 +00:00
QuoteFox
180f171b37 Merge pull request #830 from ArchieBeepBoop/sanitycheck
Fixes Codewords not changing color and MkUltra enthrall not having the proper hearing_args
2021-01-08 09:01:04 +00:00
kevinz000
6bb4498919 Merge pull request #9658 from Ghommie/Ghommie-cit291
Fixing dogborg sleepers runtimes, how atrocious...
2021-01-07 15:22:39 -03:00
Archie
f1d2abe081 Bucklefix 2021-01-07 15:19:53 -03:00
Archie
f2d51707fb tones down things that could nuke the codebase 2021-01-06 22:56:41 -03:00
Putnam3145
66a9ce77fb Merge pull request #9964 from GrayRachnid/fixmyblunder
Fixes Codewords not changing color and MkUltra enthrall not having the proper hearing_args
2021-01-06 22:14:03 -03:00
QuoteFox
cd4fe44bbf Merge pull request #789 from Tename/boggers
Borg equipment changes
2021-01-07 00:17:31 +00:00
Ghom
6dbdfa0c14 Merge pull request #10570 from kevinz000/map_network_helpers
Power cable + auto mapping helpers
2021-01-06 15:44:06 -03:00
Lin
02da471330 Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
2021-01-06 15:39:13 -03:00
Ghom
ca735a752e Merge pull request #10505 from LetterN/beep-boom
better electropack ui
2021-01-06 14:57:15 -03:00