Commit Graph

21280 Commits

Author SHA1 Message Date
kevinz000 18bdb753d3 bet 2020-03-03 21:13:59 -07:00
kevinz000 0cf7f2e882 Update energy.dm 2020-03-03 21:07:24 -07:00
kevinz000 2d02ae0077 oops 2020-03-03 21:06:29 -07:00
kevinz000 cbf2355f19 Update code/datums/elements/sword_point.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-03 21:06:05 -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
KathrinBailey 97733e464d ghommie change and armrest bug fix 2020-03-04 01:35:00 +00:00
Putnam 3059e48278 Removed 30TC thing from martyr/hijack 2020-03-03 16:46:41 -08:00
Ghom 284ef326c7 Stops ninjas employed by syndies from receiving friendly flavor objectives. 2020-03-04 00:36:18 +01:00
deathride58 49ad376e5e Adds a very basic soft restriction system. There's definite room for improvement, but this is good enough for now. Am too hongry for this. 2020-03-03 17:44:10 -05:00
Ghommie a452cfb31b ouch 2020-03-03 22:26:56 +01:00
Ghommie 9aa712d84b Fixes and improves RCL sprite update procs. 2020-03-03 22:19:12 +01:00
deathride58 560192c45a Does the thing - PORTS THE BEEPERS! also fixes a bug where body markings dont render if their name doesnt match the iconstate 2020-03-03 15:49:25 -05: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
Lin 622a060857 use defines 2020-03-03 20:22:57 +00:00
Lin 6e4a22f4fe fix boop 2020-03-03 20:18:08 +00:00
deathride58 9efdad1d6b Initial commit - lays out the foundation for a more robust limb icon override system. You're welcome. 2020-03-03 13:55:33 -05:00
Ghom d318525078 Update shuttle.dm 2020-03-03 15:43:10 +01:00
Ghom b7dda0080d Fixes cargo passive point gen (ergo making it 125 a minute and not 1000+) 2020-03-03 15:40:53 +01:00
KathrinBailey 86790c69a5 credits accidently left out previously
re-adds nod to CEV Eris for their original sprites.
2020-03-03 14:38:16 +00:00
Ghom beef891789 Update area_copy.dm 2020-03-03 15:12:54 +01:00
Ghom 490ad4373d Update area_copy.dm 2020-03-03 15:12:06 +01:00
Ghom b378da2468 Update energy.dm 2020-03-03 15:06:42 +01:00
Ghom edc53770ea Update area_copy.dm 2020-03-03 15:05:32 +01:00
Ghom c0d4c30711 Update _lists.dm 2020-03-03 14:57:32 +01:00
KathrinBailey 7e0abda3c1 fixing merge conflicts
includes trillby's new posters.
2020-03-03 13:56:01 +00:00
KathrinBailey 83ec1e428c Merge remote-tracking branch 'upstream/master' into Kat-Furniture 2020-03-03 13:48:18 +00:00
KathrinBailey fe7742637f fixing merge conflicts aaahh 2020-03-03 13:47:58 +00:00
Trilbyspaceclone d32b6ad7e9 ok 2020-03-03 08:47:17 -05:00
KathrinBailey a240daaca2 Final changes
Puts curtain crafting under plastic to stop plastic duping. You can deep rods and cloth, but the cost is 10 plastic sheets and it doesn't drop 10 plastic sheets so it's a loss.
2020-03-03 13:19:15 +00: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