Unknown
62c7ba1f80
Merge remote-tracking branch 'upstream/master' into Memes
2018-08-29 19:23:06 +02:00
Crazy Lemon
e8e5928edd
Merge pull request #9430 from FlattestGuitar/forceMove
...
you can remove items from storage with forceMove() properly
2018-08-29 08:29:26 -07:00
variableundefined
b874549978
Ensure bola cannot snare anyone without enough legs
2018-08-28 22:35:31 +08:00
Unknown
b89eec6ce6
forceMove for storage item removal
2018-08-28 10:22:45 +02:00
Crazy Lemon
195e199552
Merge pull request #9061 from Anasari/TGRefundPort
...
Port over Fox's refactored syndicate item refund from TG.
2018-08-22 22:51:12 -07:00
Crazy Lemon
d59d2e76be
Merge pull request #9303 from Kyep/teleport_fixes
...
Teleportation Fixes
2018-08-22 22:44:18 -07:00
Crazy Lemon
058d339493
Merge pull request #9336 from Kyep/depot_fixes_1
...
Depot Fixes
2018-08-22 22:33:09 -07:00
Crazy Lemon
b3f5af433a
Merge pull request #9371 from variableundefined/DefibPaddleDetach
...
Defib paddles snap away if you walk away from the defib
2018-08-22 22:27:03 -07:00
Crazy Lemon
bf8520528c
Merge pull request #9257 from variableundefined/WelderCableOverheal
...
Adds overheal to welder & cable coil
2018-08-22 22:15:38 -07:00
variableundefined
80123d90ad
Stop implantcase from disappearing
2018-08-22 22:36:02 +08:00
variableundefined
845401725e
Defib paddles snap away if you walk away from the defib
2018-08-16 21:49:39 +08:00
Kyep
f40127b348
handles incoming emagged teleport to syndibeacon
2018-08-16 02:05:40 -07:00
Kyep
1e894f11ee
CrazyLemon RPD changes
2018-08-15 22:36:53 -07:00
Kyep
7cebfc20c4
fixes for RPD and RCS exploits
2018-08-15 01:48:34 -07:00
variableundefined
a82104d4ed
Fixes comfrey
2018-08-12 09:33:37 +08:00
Superhats
90874a1e94
Merge pull request #2 from Superhats/master
...
Whoops, i was super behind
2018-08-10 10:55:03 +02:00
Crazy Lemon
6a925fb205
Merge pull request #8515 from Kyep/depot
...
Reworks Syndicate Supply Depot
2018-08-07 09:34:02 -07:00
Kyep
1f65c9a734
CrazyLemon 1, all the minor issues
2018-08-06 21:08:01 -07:00
Crazy Lemon
27c5aacdc1
Merge pull request #9306 from Tails2091/TherapyFix
...
Fixed Therapy Doll Issue
2018-08-05 18:39:12 -07:00
Tails2091
3c776efd1b
Changed Card Icon Update
2018-08-03 15:39:20 -04:00
Tails2091
c668c25e96
Fixed Therapy Doll Issue
...
Fixed issue #5167
Added icon update function to cards
Changed for loop to right format
Removed katana dupe
2018-08-02 21:33:28 -04:00
Kyep
45a88d4f3f
split teleportation changes out into another PR
2018-08-02 09:36:10 -07:00
Kyep
ce4775c6af
z6 mapmerge, teleportation.dm refactor, stop bluespace tomatoes working in tele_proof areas
2018-08-02 09:03:17 -07:00
variableundefined
7e216d32bd
Add say logging for megaphone
2018-08-02 14:59:32 +08:00
Kyep
102ff67095
fixes merge conflict
2018-08-01 04:13:22 -07:00
Anasari
b151aec3bc
Fixes merge conflict
2018-07-31 14:31:14 +08:00
Anasari
eb776551d5
Revert "Remove check_uplink_validity proc as it isn't useful yet"
...
This reverts commit 78360811c1
2018-07-31 13:47:42 +08:00
Anasari
78360811c1
Remove check_uplink_validity proc as it isn't useful yet
2018-07-31 13:41:35 +08:00
Anasari
fb0cd5d94e
Fixes & minor uplink items refactor
2018-07-31 13:37:24 +08:00
Tails2091
fef2b4c002
we the good format now
2018-07-29 13:53:45 -04:00
Tails2091
b08653c35a
Changes while loop to for
...
Why was this a while loop?
2018-07-28 18:01:23 -04:00
Fox McCloud
8860a0a194
Merge pull request #9206 from Crazylemon64/maploader_fixup
...
Fixes maploading so that the cyberiad and space hotel load cleanly again
2018-07-26 23:25:21 -04:00
variableundefined
eaf4d642cb
Adds overheal to welder & cable coil
2018-07-26 22:22:50 +08:00
Crazylemon64
b2d0bb1c0b
Fixes maploading so that the cyberiad and space hotel load cleanly again
2018-07-24 20:58:38 -07:00
variableundefined
c9d05c6bb1
Lazylen!
2018-07-25 07:21:48 +08:00
variableundefined
973affbe44
Fixes runtime error from medical kit change
2018-07-24 20:43:44 +08:00
FalseIncarnate
d4bada645a
Fixes invisible egg and donut boxes
...
Also removed duplicate instances of the pizza box icons
2018-07-22 15:33:21 -04:00
FalseIncarnate
26eb849509
merge conflict
2018-07-21 20:26:31 -04:00
Superhats
9f575c6281
Update firstaid.dm
2018-07-20 13:00:50 +02:00
Fox McCloud
c6bb2ecd4d
abductor stuff
2018-07-18 19:51:22 -04:00
Fox McCloud
7440dad57e
further conversion
2018-07-18 01:13:24 -04:00
Fox McCloud
aae5405d03
AGHHHHHHHHHHHHHHHHHHH WHATTT
2018-07-17 04:58:36 -04:00
Fox McCloud
9c3fcaa53c
AGHHHHHHHHHHHHH
2018-07-17 02:13:52 -04:00
Crazy Lemon
384fe93d33
Merge pull request #8975 from Citinited/rpd-refactor
...
RPD refactor
2018-07-16 14:22:38 -07:00
FalseIncarnate
f6de415d36
Food icon reorganization
...
Moved around some food icons, to reduce clutter in the food.dmi file
Notable moves:
- All custom food icons are now in a new file custom.dmi
- All pizza icons (food and boxes) are now in a new file pizza.dmi
- All pasta food icons are now in a new file pasta.dmi
Also removed some duplicate icons, renamed some custom food icons for
better clarity, adjusted existing code to point to new icon locations
2018-07-15 20:46:24 -04:00
Citinited
29c6e6d69b
A bunch of refactoring; RPD runtimes if a forbidden pipe is attempted to be dispensed; names loose disposals pipes
2018-07-16 00:23:03 +01:00
Fox McCloud
b2c8f051b1
Merge remote-tracking branch 'upstream/master' into camera-damage-refactor
2018-07-15 16:31:50 -04:00
Superhats
4eb2d7e397
Bye bye, combat defib
2018-07-15 21:00:47 +02:00
Superhats
bf5b7e822e
Re-adds advanced magboots, a bunch of implants, safety on the defib
2018-07-15 18:50:02 +02:00
Superhats
6704f2b999
yeet
2018-07-15 00:29:08 +02:00
