Commit Graph

21280 Commits

Author SHA1 Message Date
kevinz000
49939b0973 Update overmind.dm 2020-03-02 18:15:18 -07:00
Lin
fde24492b9 Merge pull request #11294 from Ghommie/Ghommie-cit596
An old oversight with disease/var/viable_mobtypes.
2020-03-02 18:31:25 -06:00
Kraseo
4315a4d1b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-02 23:06:29 +01:00
Ghom
bee392257e Update monkey.dm 2020-03-02 23:02:16 +01:00
Ghom
99841c9447 Update pai_shell.dm 2020-03-02 23:00:41 +01:00
Ghom
aa1f9a3695 Update _drone.dm 2020-03-02 22:59:00 +01:00
Ghom
15fed0386c Update lizard.dm 2020-03-02 22:56:15 +01:00
Ghom
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
Ghom
6f74d2a188 Update elite.dm 2020-03-02 22:34:29 +01:00
Putnam
3cba19dea7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stop-lag 2020-03-02 11:24:49 -08:00
Putnam
eefba5ce00 Removes lag 2020-03-02 11:24:46 -08:00
kevinz000
6c8154e8e1 Update damage_procs.dm 2020-03-02 12:13:36 -07:00
kappa-sama
3c7a9f068e downvoted 2020-03-02 13:51:26 -05:00
Ghommie
f08d79767b Removes makeshift switchblades 2020-03-02 19:33:31 +01:00
Kraseo
50a1feeb89 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-02 17:38:08 +01:00
Ghom
00bc635d27 Merge pull request #11296 from Putnam3145/supermatter-hardcap
Proper supermatter tweaks
2020-03-02 16:36:58 +01:00
Ghom
9375113426 Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ
Bloodsucker external blood gain rebalancing
2020-03-02 16:36:22 +01:00
Ghom
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
Ghommie
23cbb05578 Merge branch 'Ghommie-cit597' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit597 2020-03-02 16:33:56 +01:00
Ghommie
f915d14a58 Also cell chargers and cloning pods. 2020-03-02 16:28:31 +01:00
Ghom
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
Ghom
fca911b74f Merge pull request #11281 from Ragolution/master
Just another round-end sound.
2020-03-02 16:17:37 +01:00
kevinz000
1a87a9d051 Update damage_procs.dm 2020-03-02 07:24:02 -07:00
kevinz000
e1f3985309 Update musician.dm 2020-03-02 05:33:48 -07:00
kevinz000
92e95f816a Update defib.dm 2020-03-02 03:49:21 -07:00
Kraseo
e5e05d5d61 handles cases where stripping plasmamen would not give them what they need to not die 2020-03-02 11:47:44 +01:00
kevinz000
7ade79ce80 small fix 2020-03-02 03:05:51 -07:00
Trilbyspaceclone
9540c47adf Update recipes_clothing.dm 2020-03-02 00:24:36 -05:00
Trilbyspaceclone
c6be46c6bd Update recipes_clothing.dm 2020-03-02 00:22:46 -05:00
Trilbyspaceclone
da48f95de7 Update hud.dm 2020-03-02 00:11:54 -05:00
kappa-sama
ec3e2ddb24 no more laptop slowdown 2020-03-01 21:17:48 -05:00
Kraseo
41e4de9287 fixes telebatons runtiming and not being able to be extended 2020-03-02 02:47:21 +01:00
Kraseo
508511cb86 actually makes contractor pinpointer do things 2020-03-02 01:36:11 +01:00
Ghom
4d4708a6ae Update cloning.dm 2020-03-02 01:28:20 +01:00
Lin
bb05b47ead fix flypeople nutrition 2020-03-01 23:35:16 +00:00
Ghom
28c2d27860 Merge pull request #11287 from monster860/patch-1
Allow moaning while in soft crit
2020-03-02 00:13:27 +01:00
Kraseo
648f7793d3 proving to the world i'm retarded one commit line at a time 2020-03-01 23:56:34 +01:00
Kraseo
ad8013d839 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-01 23:39:16 +01:00
Kraseo
7206e5ee6e nearly forgot these as well 2020-03-01 23:31:14 +01:00
Putnam
aba8828fd4 Proper supermatter tweaks. 2020-03-01 14:20:15 -08:00
Ghommie
efaa99ae27 some dozens lines about PDA/update_overlays and cryopods/MMIs. 2020-03-01 23:17:35 +01:00
Kraseo
5da4e5fbcd parte 5: tgui and javascript torture 2020-03-01 22:57:39 +01:00
Kraseo
e3c77f2f5a part 4: the one where i slowly go insane 2020-03-01 22:05:35 +01:00
Seris02
8a647f8a8c happy now? 2020-03-02 04:22:40 +08:00
ancientpower
56ba8ef127 requested changes 2020-03-01 12:45:00 -06:00
Kraseo
ab48a6fa16 part 3: do people even read commit logs 2020-03-01 19:14:05 +01:00
Kraseo
d93ade7e03 part 2: bloody tendency 2020-03-01 17:37:18 +01:00
Kraseo
38f7821dd6 part 1: battle stream 2020-03-01 16:56:13 +01:00
Ghommie
c0ff43f827 ofc, New arguments. 2020-03-01 16:34:43 +01:00
Ghommie
b0922dd70d Actually.. 2020-03-01 16:02:58 +01:00