deathride58
2e35c09dec
Merge pull request #10451 from kevinz000/mobility_flags
...
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
Ghom
5e603c1cce
Merge pull request #11064 from Trilbyspaceclone/more_implants
...
3 new arm tool set implants
2020-03-06 01:25:02 +01:00
Ghom
44a9add328
Merge pull request #11328 from Trilbyspaceclone/Hey-Teens!
...
Removed unused techweb var - Cargo selling of Techwebs nodes
2020-03-06 01:21:09 +01:00
kevinz000
5bca5690c4
ok
2020-03-05 01:00:35 -07:00
kevinz000
b718e0e0d6
fuck
2020-03-04 16:46:09 -07:00
Ghom
68273d0211
Merge pull request #11218 from Seris02/nomoreailipreading
...
no more ai illegal upgrades, version 2 because I forgot I made it in web browser last time
2020-03-05 00:26:12 +01:00
Ghom
5e4f8dc6a0
Merge pull request #11181 from Detective-Google/big-chode-energy
...
changes sausage girth from circumference -> diameter
2020-03-04 23:49:58 +01:00
Ghom
d78cdb9b37
Merge pull request #11130 from BlackMajor/SpaceRuins
...
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
2020-03-04 23:46:10 +01:00
Ghom
c373323690
Merge pull request #11318 from Citadel-Station-13/Linzolle-patch-1
...
fix nose booping
2020-03-04 23:40:54 +01:00
Ghom
ec5449b349
Merge pull request #11327 from Arturlang/dropper_fix
...
Fixes reagent containers transfer cycling
2020-03-04 23:17:00 +01:00
TrilbySpaceClone
7e51cf9ab3
Removed unused techweb var
2020-03-04 16:30:10 -05:00
Artur
f879316b4e
All it lacked is a return.
2020-03-04 23:29:08 +02:00
Lin
1a1e362e80
Merge pull request #11310 from Citadel-Station-13/Ghommie-patch-2
...
Fixing mob holders inventory slot flags (ergo they are not glasses)
2020-03-04 13:29:13 -06:00
Ghom
7a2e0892d3
Merge pull request #11277 from kevinz000/sword_point
...
En garde! (nah just sword pointing)
2020-03-04 17:11:39 +01:00
Ghom
6dd27506e1
Merge pull request #11303 from Citadel-Station-13/kevinz000-patch-22
...
what the fuck you mean music line too long??
2020-03-04 17:11:12 +01:00
Ghom
a2fe9f0d23
Update toys.dm
2020-03-04 17:03:26 +01:00
Ghom
0b74bc9da3
Update twohanded.dm
2020-03-04 16:43:57 +01:00
Ghom
7c8b490cb3
Update energy.dm
2020-03-04 16:40:28 +01:00
Ghom
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
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
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
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
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
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
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
Lin
622a060857
use defines
2020-03-03 20:22:57 +00:00
Lin
6e4a22f4fe
fix boop
2020-03-03 20:18:08 +00: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
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
