Commit Graph

31112 Commits

Author SHA1 Message Date
Ghommie 60c7268e37 Also fixing bloodsucker coffins. 2020-03-04 16:29:09 +01:00
Ghommie f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00
CitadelStationBot 7a539d0a78 Automatic changelog generation for PR #11289 [ci skip] 2020-03-03 14:30:17 -06:00
Ghom 62eef87835 Merge pull request #11289 from Trilbyspaceclone/patch-301
Cotton/Durathreads now stack to 80
2020-03-03 21:30:14 +01:00
Ghom 0b5481f9b9 Merge pull request #11237 from kevinz000/reagent_logging_3
reagent logging pr attempt 3 but it works
2020-03-03 21:27:17 +01:00
Trilbyspaceclone d32b6ad7e9 ok 2020-03-03 08:47:17 -05:00
Ghom 107a6434fd Merge pull request #11305 from Citadel-Station-13/kevinz000-patch-23
you can no longer stamcrit a goddamn xenomorph come on citadel why is this a thing
2020-03-03 13:36:52 +01:00
CitadelStationBot 9027f04691 Automatic changelog generation for PR #11203 [ci skip] 2020-03-03 06:29:56 -06:00
Ghom f9a2326437 Merge pull request #11203 from Trilbyspaceclone/poster
Three new posters!
2020-03-03 13:29:54 +01:00
CitadelStationBot 14c1057148 Automatic changelog generation for PR #11250 [ci skip] 2020-03-03 06:26:22 -06:00
Ghom 81bb6978de Merge pull request #11250 from Seris02/risingbassnerf
Rising bass nerfs and fixes
2020-03-03 13:26:19 +01:00
CitadelStationBot 6869f5526d Automatic changelog generation for PR #11299 [ci skip] 2020-03-03 06:24:35 -06:00
Ghom 6da3cf3bbb Merge pull request #11299 from Citadel-Station-13/Linzolle-patch-1
fix flypeople nutrition
2020-03-03 13:24:32 +01:00
CitadelStationBot d679dc662c Automatic changelog generation for PR #11300 [ci skip] 2020-03-03 06:24:18 -06:00
Ghom 294668d6e1 Merge pull request #11300 from kappa-sama/patch-11
removes obsolete laptop slowdown
2020-03-03 13:24:15 +01:00
Ghom c7fe9d31e2 Merge pull request #11311 from Citadel-Station-13/kevinz000-patch-19
*HELPS* with the atrocious GC situation regarding blobs
2020-03-03 13:23:28 +01:00
Ghom 3a80d59330 Merge pull request #11312 from Citadel-Station-13/kevinz000-patch-24
Fixes a bug with garbage collection
2020-03-03 13:23:12 +01:00
Ghom 0adaa514f0 Merge pull request #11313 from Citadel-Station-13/kevinz000-patch-25
Fixes people in soft critical moving far slower than they should be
2020-03-03 13:22:55 +01:00
Seris02 8c4c2842d0 fixes and code improvements 2020-03-03 19:27:09 +08:00
kevinz000 c3913a793a Update carbon_movement.dm 2020-03-03 03:02:16 -07:00
kevinz000 81f84f1bd1 Update garbage.dm 2020-03-02 18:18:44 -07:00
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
CitadelStationBot 2d931ab3b6 Automatic changelog generation for PR #11270 [ci skip] 2020-03-02 15:46:52 -06: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
kevinz000 6c8154e8e1 Update damage_procs.dm 2020-03-02 12:13:36 -07:00
CitadelStationBot 797e96d985 Automatic changelog generation for PR #11296 [ci skip] 2020-03-02 09:37:03 -06:00
Ghom 00bc635d27 Merge pull request #11296 from Putnam3145/supermatter-hardcap
Proper supermatter tweaks
2020-03-02 16:36:58 +01:00
CitadelStationBot cc7234c177 Automatic changelog generation for PR #11041 [ci skip] 2020-03-02 09:36:25 -06: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
CitadelStationBot ee9e9878fe Automatic changelog generation for PR #11271 [ci skip] 2020-03-02 09:34:21 -06: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
CitadelStationBot 4d00dfda3f Automatic changelog generation for PR #11283 [ci skip] 2020-03-02 09:18:50 -06: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
CitadelStationBot bb7d5d3502 Automatic changelog generation for PR #11291 [ci skip] 2020-03-02 09:13:38 -06:00
Ghom 98cd2f0635 Merge pull request #11291 from YakumoChen/miningbase-chemo
Makes the mining base more natural-looking
2020-03-02 16:13:35 +01:00
CitadelStationBot b00b359ca6 Automatic changelog generation for PR #11302 [ci skip] 2020-03-02 09:11:58 -06:00
Ghom 7479ff2f02 Merge pull request #11302 from Citadel-Station-13/kevinz000-patch-21
fixes compact defibs starting with a 1k instead of 10k cell
2020-03-02 16:11:55 +01:00
kevinz000 1a87a9d051 Update damage_procs.dm 2020-03-02 07:24:02 -07:00
kevinz000 92e95f816a Update defib.dm 2020-03-02 03:49:21 -07:00
kappa-sama ec3e2ddb24 no more laptop slowdown 2020-03-01 21:17:48 -05:00
Lin bb05b47ead fix flypeople nutrition 2020-03-01 23:35:16 +00:00
CitadelStationBot a78d95c866 Automatic changelog generation for PR #11287 [ci skip] 2020-03-01 17:13:31 -06: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
Putnam aba8828fd4 Proper supermatter tweaks. 2020-03-01 14:20:15 -08:00
ancientpower 56ba8ef127 requested changes 2020-03-01 12:45:00 -06: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
Ghommie 893cca97a3 An old oversight with disease/var/viable_mobtypes. 2020-03-01 15:59:42 +01:00