e6740168d9
Added machine first aid kit code
2018-11-21 18:14:40 -05:00
c2be8936eb
Revert
2018-11-21 15:59:39 -05:00
bbba753001
Update boxes.dm
2018-11-20 21:04:49 -05:00
d0a64445eb
soup flasks
2018-11-16 09:34:57 -08:00
070c349a81
fixes merge conflict in boxes.dm
2018-11-16 09:00:30 -08:00
2063795224
revert/fix jacket, CC pinpointer, re-add dark lord, greytide toolbox
2018-11-16 08:47:45 -08:00
5a62f8ac07
Merge pull request #10179 from Eniraz/fulltile-plasma-windows-and-large-boxes
...
Fulltile plasma windows and large boxes
2018-11-11 15:09:35 +08:00
202ba8b5ed
Forgot ERT, moved the boxes to boxes.dm
2018-11-10 12:08:06 +01:00
172102a51a
Added new box sprites
...
Props to Shazbot for the sprites
2018-11-09 19:33:35 +01:00
9013820a9d
large boxes are actually bulky sized now
2018-11-09 15:50:58 +01:00
07f5e956ac
musician, ancient one, refactoring
2018-11-08 22:36:05 -08:00
9be0a83269
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Drill
2018-11-08 01:58:53 -08:00
97461b3f3d
Merge pull request #10078 from variableundefined/FermentationBarrel
...
[READY] Port Fel's fermentation barrel from tg
2018-11-07 23:09:08 -08:00
85443981bb
Merge pull request #10128 from datlo/syndisuitinternals
...
Adds internals to the syndicate spacesuit and hardsuit
2018-11-06 17:36:00 +08:00
c22304ddcb
Added to hardsuit
...
derp'd
2018-11-05 08:15:24 +00:00
f48e016e8d
Adds syndicate themed internals to the syndi spacesuit box.
...
Buff the syndicate spacesuit by adding a syndicate mask and a dark
extended emergency oxygen tank to the syndicate spacesuit box. This
makes it easier for perma'd traitors with an uplink/storage implant to
escape, allow to carry a full EVA package in a single convenient box,
and make it easier for a spaced traitor to fix his situation.
Uplink description updated to reflect the change.
2018-11-05 08:10:46 +00:00
a700f1f52c
Traitor's Toolbelt Added
...
Added the belt as a variant of the military belt in the belts.dm.
Replaced the military belt in the uplink_item.dm with the new traitor's toolbelt. Price also lowered to 2TC since even with the change, it still feels pricey at that cost for what it offers.
2018-11-04 13:30:10 +00:00
a741ff4961
Merge pull request #9949 from AffectedArc07/ghost-spawns
...
Adds Space Ruins / Ghost Roles
2018-11-02 08:12:01 +08:00
7905b64076
Port over fermentation barrel, minor refactor of reagent container, add in wine power etc.
2018-11-01 11:01:45 +08:00
0ee51bdcc2
Reverts maps. Fixes conflict.
2018-10-31 19:13:22 -07:00
9adcc85b3e
Added Safe-cracking Kit
2018-10-29 03:52:21 -07:00
687d2c8f0f
changed number of mining satchel slots to 10
2018-10-29 05:17:50 -04:00
6bece25226
Merge pull request #10008 from Normalyman/Test
...
Dragging won't open containers while incapacitated
2018-10-28 08:40:37 +08:00
3d1111ddaf
Requested Change
2018-10-27 19:54:06 +02:00
b81e43ab53
Fix for issue #7950
2018-10-27 13:49:10 +02:00
c9f9aaa8ea
item changes
2018-10-24 16:03:29 -07:00
2ebf971806
resolved icon conflicts
2018-10-21 11:46:39 +01:00
47e814cf51
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into space-ruin-number-one
2018-10-19 10:47:57 +01:00
152a350538
Deconflict
2018-10-19 16:07:04 +08:00
91dcf447ec
Merge pull request #9888 from Fox-McCloud/spark-refactor
...
Refactors Spark Spread Activation
2018-10-19 08:41:03 +08:00
73200c942d
tweak
2018-10-18 19:50:24 -04:00
35591ad940
Merge pull request #9889 from Squirgenheimer/cryoruntimefix
...
adds sanity check to show_to for storage items
2018-10-18 08:54:08 +08:00
9280f9f9bd
adds sanity check to show_to for storage items
2018-10-17 18:33:50 -04:00
3825b4e1d5
Refactors Spark Spread Activation
2018-10-17 14:31:07 -04:00
621a2a7f9d
bed time
2018-10-15 00:47:13 +01:00
ac5cc480b9
Adds the Honk Brand Infiltration Kit
...
Also adds the clown mask voice changer as part of the kit
2018-10-12 17:02:55 +01:00
569f68b128
Merge branch 'master' into RelPath
2018-10-12 14:08:19 +08:00
309e3b04f6
Clears up some relative pathing part 1
2018-10-10 23:39:34 +08:00
6b1b38d4f1
Port over tg ore stack and stack merging
...
Meta
Birbfix
Maxi
Re-add automatic satchel ore pickup (oops)
Mecha formatting
re
2018-10-09 10:06:03 +08:00
c2bf480622
Merge pull request #9631 from Birdtalon/ERT-changes
...
Gamma ERT Changes
2018-10-09 08:58:15 +08:00
4d7dd5a6c9
dayum dats defined
2018-10-08 22:48:00 +01:00
4151487c98
bugfixes
2018-10-07 18:49:48 +01:00
1628467857
Merge branch 'master' into ERT-changes
...
# Conflicts:
# icons/mob/head.dmi
2018-09-30 14:53:32 +01:00
a499b0fc68
Paving the path for a bigger inventory refactor
2018-09-23 22:26:10 +08:00
55fa8bb5bd
tidying up
2018-09-22 15:53:37 +01:00
d35155baec
Merge branch 'master' into ERT-gun
...
# Conflicts:
# code/modules/response_team/ert_outfits.dm
2018-09-22 14:04:35 +01:00
424f3ac200
changes to ERT equipment datums, organises some files a little clearer
2018-09-22 14:00:41 +01:00
6832dbe74e
Merge pull request #9373 from variableundefined/walletdecal
...
Wallet icon defaults to green if it is filled with an id of any type
2018-09-09 18:09:56 -04:00
5f11e5945e
Merge pull request #9367 from TDSSS/hypospray-belt
...
Allows medical belts to hold hyposprays
2018-09-04 09:21:37 -07:00
62c7ba1f80
Merge remote-tracking branch 'upstream/master' into Memes
2018-08-29 19:23:06 +02:00
AlAtEx