Commit Graph

20227 Commits

Author SHA1 Message Date
kevinz000 2d02ae0077 oops 2020-03-03 21:06:29 -07:00
kevinz000 6354b48659 fix 2020-03-03 20:58:06 -07:00
kevinz000 7291417244 fix 2020-03-03 20:57:03 -07:00
kevinz000 b6431b0ef6 changes 2020-03-03 20:54:53 -07:00
kevinz000 f8187d0fbf optimize move under living 2020-03-03 20:51:50 -07:00
kevinz000 334f1cc1cf linzolle 2020-03-03 20:48:39 -07:00
kevinz000 b2be57d5fe macro recursion woops 2020-03-03 20:43:54 -07:00
kevinz000 1d198aca88 CHECK_MOBILITY 2020-03-03 20:41:08 -07:00
kevinz000 8b0b685fa7 CHECK_MOBILITY 2020-03-03 20:40:33 -07:00
kevinz000 90188c51bf Merge pull request #11308 from Putnam3145/stop-lag
Removes lag
2020-03-03 20:28:47 -07:00
Ghom 284ef326c7 Stops ninjas employed by syndies from receiving friendly flavor objectives. 2020-03-04 00:36:18 +01: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
Ghom f9a2326437 Merge pull request #11203 from Trilbyspaceclone/poster
Three new posters!
2020-03-03 13:29:54 +01:00
Ghom 81bb6978de Merge pull request #11250 from Seris02/risingbassnerf
Rising bass nerfs and fixes
2020-03-03 13:26:19 +01: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
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
Seris02 8c4c2842d0 fixes and code improvements 2020-03-03 19:27:09 +08:00
kevinz000 1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
kevinz000 c21bd60929 fix 2020-03-03 03:04:23 -07: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
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
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
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
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 92e95f816a Update defib.dm 2020-03-02 03:49:21 -07:00
kevinz000 7ade79ce80 small fix 2020-03-02 03:05:51 -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
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
Arturlang 97c5aa1e24 Maintainer suggestions
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-01 16:48:49 +02:00
kevinz000 9a3ddaaf7b Update logging.dm 2020-03-01 07:08:04 -07:00