b378da2468
Update energy.dm
2020-03-03 15:06:42 +01:00
edc53770ea
Update area_copy.dm
2020-03-03 15:05:32 +01:00
c0d4c30711
Update _lists.dm
2020-03-03 14:57:32 +01:00
7e0abda3c1
fixing merge conflicts
...
includes trillby's new posters.
2020-03-03 13:56:01 +00:00
83ec1e428c
Merge remote-tracking branch 'upstream/master' into Kat-Furniture
2020-03-03 13:48:18 +00:00
fe7742637f
fixing merge conflicts aaahh
2020-03-03 13:47:58 +00:00
d32b6ad7e9
ok
2020-03-03 08:47:17 -05:00
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
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
f9a2326437
Merge pull request #11203 from Trilbyspaceclone/poster
...
Three new posters!
2020-03-03 13:29:54 +01:00
81bb6978de
Merge pull request #11250 from Seris02/risingbassnerf
...
Rising bass nerfs and fixes
2020-03-03 13:26:19 +01:00
6da3cf3bbb
Merge pull request #11299 from Citadel-Station-13/Linzolle-patch-1
...
fix flypeople nutrition
2020-03-03 13:24:32 +01:00
294668d6e1
Merge pull request #11300 from kappa-sama/patch-11
...
removes obsolete laptop slowdown
2020-03-03 13:24:15 +01:00
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
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
8c4c2842d0
fixes and code improvements
2020-03-03 19:27:09 +08:00
1e99cd0bfe
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
c21bd60929
fix
2020-03-03 03:04:23 -07:00
c3913a793a
Update carbon_movement.dm
2020-03-03 03:02:16 -07:00
81f84f1bd1
Update garbage.dm
2020-03-02 18:18:44 -07:00
49939b0973
Update overmind.dm
2020-03-02 18:15:18 -07:00
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
4315a4d1b7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-02 23:06:29 +01:00
bee392257e
Update monkey.dm
2020-03-02 23:02:16 +01:00
99841c9447
Update pai_shell.dm
2020-03-02 23:00:41 +01:00
aa1f9a3695
Update _drone.dm
2020-03-02 22:59:00 +01:00
15fed0386c
Update lizard.dm
2020-03-02 22:56:15 +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
6f74d2a188
Update elite.dm
2020-03-02 22:34:29 +01:00
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
eefba5ce00
Removes lag
2020-03-02 11:24:46 -08:00
6c8154e8e1
Update damage_procs.dm
2020-03-02 12:13:36 -07:00
f08d79767b
Removes makeshift switchblades
2020-03-02 19:33:31 +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
23cbb05578
Merge branch 'Ghommie-cit597' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit597
2020-03-02 16:33:56 +01:00
f915d14a58
Also cell chargers and cloning pods.
2020-03-02 16:28:31 +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
1a87a9d051
Update damage_procs.dm
2020-03-02 07:24:02 -07:00
e1f3985309
Update musician.dm
2020-03-02 05:33:48 -07: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
7ade79ce80
small fix
2020-03-02 03:05:51 -07:00
9540c47adf
Update recipes_clothing.dm
2020-03-02 00:24:36 -05:00
c6be46c6bd
Update recipes_clothing.dm
2020-03-02 00:22:46 -05:00
da48f95de7
Update hud.dm
2020-03-02 00:11:54 -05:00
ec3e2ddb24
no more laptop slowdown
2020-03-01 21:17:48 -05:00
Ghom