Commit Graph

711 Commits

Author SHA1 Message Date
ZomgPonies 8714512403 Superhero Part 2: Owlman vs. The Griffin! 2015-02-24 20:13:00 -05:00
SamCroswell 8807f13305 ERT - Helmets Change, Cells Capacity Adjustment
The pulse pistol now has 1600 max charge, the Carbine now has a max
charge of 4000.

ERT helmets no longer need to be fastened to their suits to be equipped,
as this was causing bugs.
2015-02-24 14:25:28 -05:00
Fox-McCloud 6fba118892 Merge remote-tracking branch 'upstream/master' into Fixes 2015-02-23 16:47:55 -05:00
Fox-McCloud 96a941ba19 Fixes and Guns 2015-02-22 16:32:35 -05:00
Markolie 672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
ZomgPonies 1c1ebc3f3f Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits
Syndi hardsuits
2015-02-22 08:27:38 -05:00
Fox-McCloud 2a1028324c Thickmaterial Flag 2015-02-21 07:26:25 -05:00
Markolie d8d1670b68 Revert "Revert "Saycode/language/species port from Bay""
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-02-20 17:46:35 +01:00
Fox-McCloud be2e754706 Syndicate Rebalance 2015-02-20 03:14:12 -05:00
DZD 212ca5f5bd MERGE CONFLIIIIIICTS 2015-02-19 20:26:36 -05:00
ZomgPonies d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
DZD d0d6c8eebd Merge with upstream/master
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
DZD 4bcdb94a99 Merge with upstream/master
Fixes conflicts
2015-02-18 13:41:32 -05:00
DZD fbd9c367c0 NODROP flag addition & handling
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
Markolie 21926c9e48 Part 1 of saycode/language/species port from Bay 2015-02-17 23:20:50 +01:00
Fox-McCloud 1e4d1df880 Merge remote-tracking branch 'upstream/master' into Cargo 2015-02-14 22:02:39 -05:00
Fox-McCloud 0de7e1035c Cargo Supplies 2015-02-14 21:21:09 -05:00
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 a4cda9287f Merge with upstream/master 2015-02-12 16:43:01 -05:00
DZD b3a0c9a975 Removes TABLEPASS and FPRINT flags
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05: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