Commit Graph

592 Commits

Author SHA1 Message Date
Markolie
9fed8135d4 Handcuff refactor, IV drip fix 2015-02-14 04:35:32 +01:00
Markolie
0b937d5ace Emag refactor 2015-02-13 16:59:20 +01:00
DZD
03d0699637 Fixes runtime with getting inventory
- Fixes runtime at living.dm line 195, when return_inv() is called for
suits and accessories that store items.
- Fixes use of 'stat == 2' instead of 'stat == DEAD' in objective.dm
2015-02-10 09:25:54 -05:00
Markolie
354e569f9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/machinery/rechargestation.dm
2015-02-09 16:15:00 +01:00
Markolie
7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Markolie
1af0b33393 Fix bluespace storage in accessories 2015-02-09 15:22:39 +01:00
Markolie
d10451c567 Fix a bunch of runtimes 2015-02-09 04:03:20 +01:00
Markolie
37811366a8 Action button fix 2015-02-08 15:14:03 +01:00
Markolie
fba99e154d Accessory fixes 2015-02-08 14:55:32 +01:00
Markolie
8fae0f029f Accessory overhaul 2015-02-08 14:29:10 +01:00
Fox-McCloud
4d89f5b086 Merge pull request #256 from Artorp/MorgueChanges
Morgue indicator changes
2015-02-07 12:29:05 -05:00
Fox-McCloud
94eccfffcc MetaToys 2015-02-06 23:25:13 -05:00
Artorp
789adac9c3 - Antibody scanner added to suit slots
Antibody scanner added wherever the health analyzer went
2015-02-06 15:07:48 +01:00
Fox-McCloud
fb70920bc3 Merge pull request #254 from Markolie/master
Bug fixes, latejoining additions
2015-02-05 20:26:20 -05:00
Markolie
95679c01bb Bug fixes 2015-02-05 12:55:18 +01:00
Fox-McCloud
fd23cc9861 Out of Time 2015-02-03 01:12:00 -05:00
Fox-McCloud
f7c1c8b0e9 Spacesuit Buff 2015-01-31 23:36:56 -05:00
Markolie
56cd293f4b Unused/WorkInProgress folder cleanup 2015-01-31 16:40:29 +01:00
Fox-McCloud
9865c61c7c Skrell Hardsuits 2015-01-29 18:31:15 -05:00
Fox-McCloud
655fdd9106 RIG Helmets 2015-01-29 16:33:51 -05:00
Fox-McCloud
13919cbdc2 Merge pull request #229 from Artorp/ParamedicChanges
Paramedic hazard vest and ambulance spare key
2015-01-29 14:26:24 -05:00
DZD
a93ef4dd1b The Return of the Shoulder Holster
- Detective's shoulder holster now only fits projectile-based (not
energy) handguns.
- Swaps the detective's belt holster for the old shoulder holster.
- Makes some specific handguns actually fit inside of holsters.

- Unrelated: Removes a debug output from
/code/modules/power/singularity/generator.dm
2015-01-29 13:23:46 -05:00
Artorp
1711eac2ef Added allowed list to paramedic hazard vest
Added missing allowed list to paramedic hazard vest, it can now carry
things such as health analyzers, flashlights, syringers and radios.
2015-01-29 09:14:28 +01:00
Fox-McCloud
eaa54e35a7 Vox Hardsuits and Spacesuits 2015-01-26 18:04:22 -05:00
Fox-McCloud
4ef4cce391 Merge pull request #216 from Fox-McCloud/Sec-Armor
Security Armor Buff
2015-01-24 21:58:07 -05:00
Fox-McCloud
74f51188d9 Security Armor Buff 2015-01-24 21:53:50 -05:00
DZD
6562c9fb83 Merge with upstream 2015-01-24 19:41:24 -05:00
DZD
5479a71f14 Merge with upstream/master 2015-01-24 18:52:51 -05:00
Fox-McCloud
6c3224fe75 Fixes and Such 2015-01-24 18:30:40 -05:00
DZD
73a1d7ba31 Brig Physician Vest
- Adds Brig Physician vest, sprite by TheFlagbearer.
- Makes changes to Brig Physician locker so that it no longer contains
sec gear, now contains one of every kind of medkit, a flash,
pepperspray, a brig physician vest, a doctor's jumpsuit, white shoes,
and a brig physician headset.
2015-01-24 17:21:05 -05:00
DZD
2f401fd7d3 Syndicate Strike Team and Deathsquad Improvements
- SST and DS members now get advanced magboots instead of combat boots,
with the SST getting ones that share a sprite with the blood-red
magboots.
- SST and DS members now get a fully pressurized double emergency oxygen
tank, as the emergency oxygen tanks they were getting were laughably
inadequate.
- Filled double emergency oxygen tank is a subtype of the 1/3 filled
one, so those are left unchanged.
- SST space suits are now as armored and acid-proof as DS space suits.
- SST space suits are now a subtype of the two specific colored
Syndicate spacesuits they used, so the originals remain unchanged, as
they spawn on away missions.
2015-01-23 10:53:39 -05:00
Markolie
09321d6c0b Use station_name proc where possible, mapfix 2015-01-21 23:37:05 +01:00
Markolie
2dfdd7243c Disable hardsuit breaches, re-add engi shuttle 2015-01-19 18:18:58 +01:00
Markolie
b58b469a20 Obese psych fix 2015-01-17 05:06:01 +01:00
Fox-McCloud
159bf0f56c Flashbang-Headsets 2015-01-13 16:33:49 -05:00
SamCroswell
3b7e95ba5f Ninja Nerfs 2015-01-10 13:50:44 -05:00
Bone White
15febb3e7f Fedora tip fix
now shows to visible players
2015-01-09 07:24:57 +00:00
Fox-McCloud
81a4bfed43 Security Clothing 2015-01-07 23:11:52 -05:00
Fox-McCloud
47b6e2d109 Oops 2015-01-02 22:02:56 -05:00
Fox-McCloud
ff2b7cedb2 Clothing Restructuring 2015-01-02 12:40:42 -05:00
Fox-McCloud
43af351d27 Odds and Ends 2015-01-01 21:05:50 -05:00
Fox-McCloud
a92921786f Clothing Update 2015-01-01 11:23:48 -05:00
Fox-McCloud
525bb1a96f Stun Changes 2014-12-30 12:30:14 -05:00
Markolie
f03bbf8bc6 Bug fixes 2014-12-24 12:53:49 +01:00
SamCroswell
774e43f985 Minor Depot Changes, Adds Stuff to Xenobotany Maint 2014-12-20 00:22:46 -05:00
Markolie
10ad4ad531 Mapfix, coroner description fix 2014-12-18 17:54:32 +01:00
Markolie
19fde1c4a0 Bug fixes 2014-12-17 21:56:37 +01:00
Fox-McCloud
4eff415d2f Detective Scanner 2014-12-17 08:10:03 -05:00
Markolie
22eb3e3c29 Bug fixes 2014-12-13 21:53:01 +01:00
Fox-McCloud
066d5bb991 Merge pull request #57 from Markolie/master
Bug fixes
2014-12-10 00:31:12 -05:00