Ghom and GitHub
a2fe9f0d23
Update toys.dm
2020-03-04 17:03:26 +01:00
Ghom and GitHub
0b74bc9da3
Update twohanded.dm
2020-03-04 16:43:57 +01:00
Ghom and GitHub
7c8b490cb3
Update energy.dm
2020-03-04 16:40:28 +01:00
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
Ghom and GitHub
976080d7b2
Merge pull request #11314 from KathrinBailey/Kat-Furniture
...
Kat Furniture! New sofas, chess pieces, nine new posters and shower curtain functionality!
2020-03-04 15:40:01 +01:00
Ghom and GitHub
8c6b5b49c5
Update contraband.dm
2020-03-04 15:39:23 +01:00
KathrinBailey
11750b4fa9
removed redundant icon line
2020-03-04 14:16:27 +00:00
Ghom and GitHub
df5b4ab56d
Merge pull request #11321 from kevinz000/storage_components_are_bad
...
fixes storage closing while dragging, aka "this one line fix that i procrastinated giving a fuck about for about 9 months now"
2020-03-04 14:31:09 +01:00
kevinz000 and GitHub
f67fa08f0f
Merge pull request #11274 from Citadel-Station-13/Ghommie-patch-5
...
Fixing a whoopsie with airlocks.
2020-03-04 05:58:44 -07:00
Kraseo
edfe50579e
ACTUALLY fixes null runtimes + double contracts
2020-03-04 13:17:24 +01:00
Kraseo
4ac2848282
fixes contract target blacklisting
2020-03-04 12:35:36 +01:00
BlackMajor
43e77f7d3a
Last few fixes. Adds arcane wand to dead wizard roid.
2020-03-04 19:12:56 +13:00
kevinz000
5e2414bd90
fix
2020-03-03 22:25:35 -07:00
kevinz000 and GitHub
18bdb753d3
bet
2020-03-03 21:13:59 -07:00
kevinz000 and GitHub
0cf7f2e882
Update energy.dm
2020-03-03 21:07:24 -07:00
kevinz000
2d02ae0077
oops
2020-03-03 21:06:29 -07:00
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 and GitHub
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 and GitHub
284ef326c7
Stops ninjas employed by syndies from receiving friendly flavor objectives.
2020-03-04 00:36:18 +01: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
Ghom and GitHub
62eef87835
Merge pull request #11289 from Trilbyspaceclone/patch-301
...
Cotton/Durathreads now stack to 80
2020-03-03 21:30:14 +01:00
Ghom and GitHub
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 and GitHub
622a060857
use defines
2020-03-03 20:22:57 +00:00
Lin and GitHub
6e4a22f4fe
fix boop
2020-03-03 20:18:08 +00:00
Ghom and GitHub
d318525078
Update shuttle.dm
2020-03-03 15:43:10 +01:00
Ghom and GitHub
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 and GitHub
beef891789
Update area_copy.dm
2020-03-03 15:12:54 +01:00
Ghom and GitHub
490ad4373d
Update area_copy.dm
2020-03-03 15:12:06 +01:00
Ghom and GitHub
b378da2468
Update energy.dm
2020-03-03 15:06:42 +01:00
Ghom and GitHub
edc53770ea
Update area_copy.dm
2020-03-03 15:05:32 +01:00
Ghom and GitHub
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 and GitHub
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 and GitHub
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
