Commit Graph

168 Commits

Author SHA1 Message Date
Fox-McCloud
057c15982e Re-adds Security Helmets to Officer's Lockers 2015-07-11 10:10:57 -04:00
Fox-McCloud
a89ddd5a7d Adds in Ether 2015-06-28 20:39:26 -04:00
TheBeoni
fd4c40fcf9 Added brig physician jumpsuit. Brig Physician spawns with one, i also put one spare into locker. 2015-06-17 02:11:01 +02:00
Fox-McCloud
8a78887ba6 Blueshield Jacket Re-submission 2015-06-14 14:23:55 -04:00
Fox-McCloud
296093951b defib failed 2015-06-03 02:24:02 -04:00
Fox-McCloud
c5f16b538a oops 2015-06-03 00:27:38 -04:00
Fox-McCloud
41512b0252 Exam Room Tweaks 2015-06-02 23:17:17 -04:00
Fox-McCloud
5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
FalseIncarnate
a1cce51559 Merge Conflict Fix, Attempt 2 2015-05-27 01:07:19 -04:00
FalseIncarnate
c385cb7f4f Botany Belt, Biogenerator Additions
Adds in the new Botany Belt, a belt designed for handling all sorts of
botany-related tools.

Adds the Botany Belt, Security Belt, Medical Belt, Janitor Belt, and
Bandolier to the Biogenerator's list of products.

Re-arranges the biogenerator's product listing to have a new "Belts"
section, dedicated to (you guessed it) belts.
- Moves the Utility (tool) into the Belts section, previously was in the
Leather section
- The new belt listings are also in this section.

All belts in the biogenerator have the same base cost of 300 points.
Increasing the efficiency of the machine will lower the costs
appropriately.

Adjusts some code related to the security belt so they won't magically
have a seclite in them when created via biogenerator.
- The belts in the sec lockers will still have their light
- The ERT belt no longer needs to clear contents during its New() proc
to remove the seclite.
2015-05-26 13:54:24 -04:00
ZomgPonies
e056abfb82 3/3 port done 2015-05-25 20:16:34 -04:00
Fox-McCloud
1c1eec3210 Tweaks and Fixes 2.0 2015-05-22 16:29:12 -04:00
FreeStylaLT
c290b1471e Engineering berets changes
Adds in a REAL Engineering beret, renames the current one to "atmospherics
beret", they spawn in engineering and CE's lockers.
2015-05-03 01:41:42 +03:00
Svej
a0e1cd5683 Nanotrasen Representative hat
Adds a fancy hat to the NT Reps locker
2015-03-30 14:10:28 +02:00
ZomgPonies
e2a4ccc8a6 Merge pull request #681 from Fox-McCloud/End-Era
[Goonchem] Transition to Goonchem
2015-03-28 12:25:35 -04:00
Fox-McCloud
d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
Cheridan
acba4c6cf6 Adds construction permits
Conflicts:
	code/game/gamemodes/objective_items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/paperwork/photography.dm
	icons/obj/items.dmi
2015-03-26 18:52:29 +01:00
Fox-McCloud
b30d3f795f Goonchem Map Changes 2015-03-24 22:48:25 -04:00
Fox-McCloud
01fa55adda Test Lab 2015-03-20 07:11:30 -04:00
Markolie
cacc2bf917 Fixes 2015-03-16 18:49:47 +01:00
Fox-McCloud
a31cdc9091 Merge pull request #572 from SamCroswell/NinjaDev
Ninja Restructure
2015-03-15 16:58:41 -04:00
SamCroswell
62ae69c816 Ninja File Structure Rework
Restructures the ninja files into a more spaced-out version, compliments
of /TG/. The energy katana is also their handiwork.

Add an emag act to crates and lockers instead of handling everything in
attackby.
2015-03-13 20:42:54 -04:00
SamCroswell
65b530fbe6 Locker Fix - Part Zwei 2015-03-08 21:01:01 -04:00
SamCroswell
03a13fca3a Locker Fix 2015-03-08 20:53:47 -04:00
Fox-McCloud
89f2aea30d Insulated Gloves Fix 2015-03-08 19:12:35 -04:00
Fox-McCloud
4e4e7ae77f Crayons and Gloves 2015-03-06 21:40:57 -05:00
Fox-McCloud
3bed31e08c Chemistry Cleanup and Fixes 2015-03-01 16:34:23 -05: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
Fox-McCloud
30465b03d6 Telescopic Riot Shield 2015-02-27 07:31:03 -05:00
ZomgPonies
d14c4e4f58 Merge pull request #431 from Fox-McCloud/Lasers-Tasers
Laser Additions and Taser Nerf
2015-02-26 22:49:46 -05:00
Fox-McCloud
9850e6deb2 Laser Additions and Taser Nerf 2015-02-25 23:34:42 -05:00
Markolie
e1f0d0fec7 Bug fixes, add atmos watertank 2015-02-25 19:47:04 +01: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
Markolie
efb45ea228 Table crafting refactor 2015-02-22 01:50:57 +01:00
Markolie
ad167dc541 Announcement system overhaul, crew monitor system overhaul, add portable crew monitor 2015-02-16 19:03:29 +01:00
Markolie
0792a40379 Add zipties to secvender, replace box of handcuffs in warden's locker with zipties box 2015-02-14 22:31:31 +01:00
Markolie
9fed8135d4 Handcuff refactor, IV drip fix 2015-02-14 04:35:32 +01:00
Markolie
7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Markolie
c1b6bba1ec Fix vulnerabilities in air alarm and APC, fix mitochondria log 2015-02-08 17:07:55 +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
f7c1c8b0e9 Spacesuit Buff 2015-01-31 23:36:56 -05:00
Fox-McCloud
2b85b9b777 TG Mining Items 2015-01-30 00:23:53 -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
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
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