Commit Graph

180 Commits

Author SHA1 Message Date
TheBeoni 5b376bcf76 Blueshied to Blueshield Fix.
I misspelt Blueshield for Blueshied so i am ashamed.
2015-06-16 23:34:01 +02:00
Fox-McCloud 8a78887ba6 Blueshield Jacket Re-submission 2015-06-14 14:23:55 -04:00
Robertha89 662a101bce adds xeno fat suit 2015-06-14 09:12:40 +02:00
Fox-McCloud e4cbc5619e Classic Baton Refactor 2015-06-05 18:01:50 -04:00
Fox-McCloud 0602435d8a Fixes and Tweaks to Defenses 2015-05-30 01:47:25 -04:00
Fox-McCloud 0a4ea0b326 LINDA--Updated Gas Datums and Atmospheric Defines 2015-05-18 20:10:30 -04:00
AnturK 568d289a67 Generic Action\Action Button System
This commit ports the GAABS from -tg-station13. The GAABS allows for
generic, movable, hud elements for spells, powers, and items.
2015-05-11 09:32:08 -07:00
ZomgPonies bfb997f3d2 Gave EN a prototype magnetic spell 2015-05-07 20:51:47 -04:00
ZomgPonies 547f606677 Gave EN's suit minor magnitis, also made affect machine people 2015-05-07 18:20:55 -04:00
ZomgPonies 7423d56c06 Adds E-N and gear 2015-05-07 16:12:43 -04:00
ZomgPonies 2cb22ac647 Finished adding LightnIan and the spells datum stuff 2015-05-05 19:52:38 -04:00
Fox-McCloud 718ad57231 Buffs Reactive Tele-Armor 2015-04-11 03:33:49 -04:00
SamCroswell 5d1ce61a7d Various Fixes 2015-04-06 12:39:14 -04:00
SamCroswell 8829a90709 NT Rep + Blueshield Uniform Change 2015-03-08 16:59:01 -04:00
Markolie 4fb7a95cff ERT equipment update 2015-03-04 17:16:19 +01:00
Markolie e4328a7f5e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
2015-02-28 17:13:53 +01:00
Markolie f7426c8d72 Add bandanas, mask toggling, camo armor jacket and bugfixes 2015-02-28 17:09:45 +01:00
ZomgPonies ccfb89199e New sea admiral suit and hat 2015-02-26 12:58:20 -05:00
ZomgPonies 8714512403 Superhero Part 2: Owlman vs. The Griffin! 2015-02-24 20:13:00 -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
Fox-McCloud 2a1028324c Thickmaterial Flag 2015-02-21 07:26:25 -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
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
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 8fae0f029f Accessory overhaul 2015-02-08 14:29:10 +01: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
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
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
Fox-McCloud 81a4bfed43 Security Clothing 2015-01-07 23:11:52 -05:00
Fox-McCloud ff2b7cedb2 Clothing Restructuring 2015-01-02 12:40:42 -05:00
Fox-McCloud a92921786f Clothing Update 2015-01-01 11:23:48 -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 19fde1c4a0 Bug fixes 2014-12-17 21:56:37 +01:00
Markolie bd11c78235 Replace every instance of NanoTrasen with Nanotrasen. 2014-11-29 21:01:29 +01:00
Fox-McCloud 3b884622c5 Job Changes 2014-11-29 09:10:31 -05:00
Markolie 6cfea53224 The Mortician's labcoat can now be (un)buttoned 2014-11-26 23:43:50 +01:00
Markolie 7554748a26 Adds Mortician, vomit mask fix, fix for missing images for various jobs 2014-11-26 20:44:06 +01:00
Markolie 42dd08ff7d Variable typo fix, add proper Unati/Tajaran hardsuit conversion from Baystation 2014-11-22 02:24:21 +01:00
Markolie 06b0a7a89f Re-add Dave's changes, nerf remote view/remote talk 2014-11-21 00:17:52 +01:00
Fox-McCloud a8bda9d958 Merge pull request #438 from Bram961/master
Pirate outfit
2014-11-07 10:40:46 -05:00
Fox-McCloud e1c83d7f55 Nuke-Ops-Final 2014-11-06 07:29:16 -05:00