edfe50579e
ACTUALLY fixes null runtimes + double contracts
2020-03-04 13:17:24 +01:00
4ac2848282
fixes contract target blacklisting
2020-03-04 12:35:36 +01:00
4315a4d1b7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-02 23:06:29 +01:00
c984cd7677
Merge pull request #11270 from ancientpower/paramedic-tweaks
...
Paramedic tweaks (sprites/access/stuff for future use)
2020-03-02 22:46:49 +01:00
50a1feeb89
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-02 17:38:08 +01:00
00bc635d27
Merge pull request #11296 from Putnam3145/supermatter-hardcap
...
Proper supermatter tweaks
2020-03-02 16:36:58 +01:00
9375113426
Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ
...
Bloodsucker external blood gain rebalancing
2020-03-02 16:36:22 +01:00
782f992c8c
Merge pull request #11271 from Citadel-Station-13/kevinz000-patch-19
...
Pushing stuff now checks for Process_Spacemove on the automatic step
2020-03-02 16:34:18 +01:00
4ed92ff03a
Merge pull request #11283 from Trilbyspaceclone/patch-299
...
Makes most winter coats and hoods have their own desc
2020-03-02 16:18:47 +01:00
fca911b74f
Merge pull request #11281 from Ragolution/master
...
Just another round-end sound.
2020-03-02 16:17:37 +01:00
92e95f816a
Update defib.dm
2020-03-02 03:49:21 -07:00
e5e05d5d61
handles cases where stripping plasmamen would not give them what they need to not die
2020-03-02 11:47:44 +01:00
41e4de9287
fixes telebatons runtiming and not being able to be extended
2020-03-02 02:47:21 +01:00
508511cb86
actually makes contractor pinpointer do things
2020-03-02 01:36:11 +01:00
28c2d27860
Merge pull request #11287 from monster860/patch-1
...
Allow moaning while in soft crit
2020-03-02 00:13:27 +01:00
648f7793d3
proving to the world i'm retarded one commit line at a time
2020-03-01 23:56:34 +01:00
ad8013d839
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-01 23:39:16 +01:00
7206e5ee6e
nearly forgot these as well
2020-03-01 23:31:14 +01:00
aba8828fd4
Proper supermatter tweaks.
2020-03-01 14:20:15 -08:00
5da4e5fbcd
parte 5: tgui and javascript torture
2020-03-01 22:57:39 +01:00
e3c77f2f5a
part 4: the one where i slowly go insane
2020-03-01 22:05:35 +01:00
56ba8ef127
requested changes
2020-03-01 12:45:00 -06:00
ab48a6fa16
part 3: do people even read commit logs
2020-03-01 19:14:05 +01:00
d93ade7e03
part 2: bloody tendency
2020-03-01 17:37:18 +01:00
38f7821dd6
part 1: battle stream
2020-03-01 16:56:13 +01:00
97c5aa1e24
Maintainer suggestions
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-01 16:48:49 +02:00
9a3ddaaf7b
Update logging.dm
2020-03-01 07:08:04 -07:00
20a5ab895f
Merge pull request #11268 from raspyosu/vamp-revamp
...
ongoing vampire ability balance/rework attempt
2020-03-01 14:39:03 +01:00
3ec80872f0
Merge pull request #11279 from Hatterhat/tg-45232-lavariver
...
tgstation 45232 - lava rivers can no longer be plasma'd for basalt
2020-03-01 13:55:03 +01:00
d00596b49d
fix cloak not restoring initial move intent sometimes (maybe)
2020-03-01 00:24:56 -05:00
cdd97e8547
she
2020-03-01 00:12:45 -05:00
e2b706961a
Turns out this is Rag's PR and not mine
...
Neet
Co-Authored-By: Ragolution <bloodlust3333@gmail.com >
2020-03-01 00:11:32 -05:00
899f1bbd88
Allow moaning while in soft crit
2020-02-29 21:02:37 -05:00
609dc0e792
Merge pull request #11242 from Kraseo/green-thumb
...
Adds reagent traits to Lavaland flora + a botany QOL change
2020-02-29 23:03:53 +01:00
eeb8ec0b90
Merge pull request #11276 from kevinz000/gc_debug
...
adds and improves some gc debugging stuff
2020-02-29 22:53:58 +01:00
295cd2991d
Merge pull request #11227 from Putnam3145/salbut-jitter
...
Gave jittering to salbutamol
2020-02-29 20:42:03 +01:00
3c9d592b8a
Update miscellaneous.dm
2020-02-29 09:51:40 -05:00
f44908dc2e
forgot icon state changes
2020-02-29 02:03:25 -06:00
5c5ec541ae
Merge branch 'master' into paramedic-tweaks
2020-02-29 01:55:46 -06:00
f48e56fe44
thanks mapdiffbot
2020-02-29 01:49:42 -06:00
727ec433f3
funny story my byond crashes every compile
2020-02-29 01:47:59 -06:00
c4113824f7
more fixes
2020-02-29 01:47:19 -06:00
d32cc370ad
Merge pull request #11177 from Citadel-Station-13/Ghommie-patch-1
...
Broom shenanigeans.
2020-02-29 00:22:24 -06:00
5ee4a355c1
Merge pull request #11178 from Citadel-Station-13/Ghommie-patch-2
...
Fixing refrigerators locking when closed
2020-02-29 00:21:43 -06:00
49bff8e649
Update ticker.dm
...
Minor typo
2020-02-29 01:15:16 -05:00
70e2563579
Merge pull request #11266 from Ghommie/Ghommie-cit593
...
Fixing another couple mob holder oversights.
2020-02-29 00:13:58 -06:00
5ba6320f5e
Merge pull request #11261 from Ghommie/Ghommie-cit591
...
Fixing escaped characters in flavor texts.
2020-02-29 00:12:35 -06:00
763fee141d
Adds new audio file to defines in ticker for round-end sounds.
...
hello ticker my old friend
ive come to fuck with you again
the memes to my mind, slowly creeping
shitposts when i should probably be sleeping
and the question
that was planted in my brain
still remains
why the fuck is this in the /ticker/
2020-02-29 01:11:20 -05:00
a3eef43445
Merge pull request #11263 from Citadel-Station-13/Ghommie-patch-3
...
Removes extra unwarranted paramedic access.
2020-02-29 00:11:16 -06:00
1577a00ab5
tg 45232
2020-02-28 21:54:55 -06:00
Kraseo