Commit Graph

296 Commits

Author SHA1 Message Date
Jamini
f05c44dc23 Praying this works
Added Lockable lockers for atmos techs
Adjusted equipment in lockers
Adjusted wardrobe lockers
Added Engineering berets
Rearranged equipment in engineering

Signed-off-by: Jamini <mobiousjami@gmail.com>
2013-08-13 18:57:08 -04:00
Mloc-Argent
71bdaa1698 Fully reverts clickdelay change.
It was immensely buggy with certain mobs, and server lag all but negated the benefits.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-13 13:10:09 +01:00
Zuhayr
840468cb14 Fixed the order of update/return statements for dispenser. 2013-08-08 23:17:38 -07:00
Zuhayr
23301d9b73 Made dispensers unwrenchable. 2013-08-08 22:56:31 -07:00
Zuhayr
618afa1be7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2013-08-03 09:16:41 -07:00
Zuhayr
a8c04cefc6 Merge. 2013-08-03 09:14:20 -07:00
Segrain
d51809faa2 Separating autoinjectors box from injector box. 2013-08-02 19:30:02 +03:00
Segrain
c2712dd9d3 Fix for #3410. 2013-08-01 20:58:35 +03:00
comma
c8f5b98a95 Autoinjectors.
Now they are one-use, as they were intended.
You can still change their contents with syringes before they are used.
To mitigate their one-use nature, box of them is added to medical closets and supply pack.
2013-08-01 08:12:56 +04:00
Mloc-Argent
9d2e107005 Reactiveness update part 1: Removed click delays from most objects, keeping them on for attacks and breaking windows/grilles.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-25 18:30:24 +01:00
RusskiSam
df8c6cdbcf Added engineering tape roll to CE closet. 2013-07-24 07:27:06 -07:00
RusskiSam
74f951ed75 HoS and Warden's closets get police tape roll.
Tape rolls are now available for all security jobs.
2013-07-24 07:20:31 -07:00
RusskiSam
b3e5bbdc14 Adds police tape roll to Detective's Cabinet.
Signed-off-by: RusskiSam
2013-07-24 04:28:03 +04:00
Mloc-Argent
adc3c14779 Revert #3316 from BEF due to compile errors and (assumed) missing files.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-20 18:38:00 +01:00
LordBraindead
08d2e22220 fire update
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
2013-07-14 21:20:45 +02:00
fauxtada
c41abfc929 Edits contents of virology biohazard closets to be more virus resistant. Now with robust internals! 2013-07-09 07:02:17 -07:00
Spamcat
df90824d60 Whoa, 2 barsign.dm's? WTF? 2013-07-08 23:25:13 +04:00
Spamcat
5f690e150d Part 3: fixing shit 2013-07-06 02:53:06 +04:00
Spamcat
63de302a09 Part 2: construction. 2013-07-06 02:53:03 +04:00
Spamcat
0e4271f97c Stage 1: deconstruction. 2013-07-06 02:53:01 +04:00
Zuhayr
3192323c19 Fixes #3200 2013-06-29 16:57:08 -07:00
Segrain
29903c46e3 Quickfix for multitile doors. 2013-06-25 11:40:01 +03:00
SkyMarshal
aa85e757d4 Added a better framework for multi-tile doors, pulling works strangely though. 2013-06-24 17:21:55 -07:00
Segrain
7fec5309f7 Airlock construction update. 2013-06-23 20:42:58 +03:00
Segrain
dcf984577a Adding construction of req_one_access doors. 2013-06-18 02:47:24 +03:00
Segrain
91e1e848f7 Bugfixes for windoor construction. 2013-06-18 02:34:15 +03:00
Asanadas
7479fd272c Added Malsquando's colored suit to the hop's wardrobe locker.
Everything should be working correctly.
2013-06-13 09:41:52 -04:00
Chinsky
bb26c5a7cb Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into newstuff
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
2013-06-12 23:11:28 +04:00
Vetinari
3c0a424bb3 Medbay Remap post-ERT
Medbay Overhaul, mapping post-ERT changes, recommit of previous files
due to computer derp.
2013-06-12 23:27:36 +10:00
Chinsky
6dc2d9d2dc Merge pull request #3015 from comma/master
Fix
2013-06-10 11:50:50 -07:00
Chinsky
eaf6b64277 Compile fix. 2013-06-09 19:53:08 +04:00
Chinsky
4118d183c1 No fun allowed.
Fixes some hilarious stool glitches.
2013-06-08 05:27:32 +04:00
MisterBook
eab6f4fc44 Taser fix v.3.2
Now accounts for multiple layers of armor.

I've also commented out Vox stuff, while Zuhayr fixes it. Because, no compile.

I also fixed whistle.dm
2013-06-05 19:37:29 -05:00
Chinsky
211fc25f0d Should probably slap it here, OR ELSE. 2013-06-05 21:58:27 +04:00
Chinsky
cfbc3e5352 Added webbing and vests to lockers. 2013-06-05 21:35:56 +04:00
Zuhayr
9e71180e1b Merge conflict resolution, using BEF. 2013-06-05 14:22:04 +09:30
Chinsky
abc2e6b96b Merge pull request #2903 from fauxki/bleeding-edge-freeze
DON'T MERGE - BEF - Bar / Holodeck / Theatre / Hydroponics Revamp
2013-06-03 01:59:33 -07:00
Segrain
3d41e24664 Minor tweaks to spawning medical clothes. 2013-06-02 23:01:33 +03:00
Chinsky
63f9549596 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into whistle
Conflicts:
	baystation12.dme
2013-06-01 17:12:51 +04:00
Chinsky
6de8060545 Added hailers to the Sec closets. 2013-06-01 08:34:31 +04:00
fauxtada
f367d7de19 Bar / Holodeck / Theatre / Hydroponics Revamp
- http://baystation12.net/forums/viewtopic.php?f=20&t=7692
- Added six new fields to the holodeck. Theatre, Meeting Hall, Picnic Area, Snow Field, Space Walk, and Desert.
- Added a Hydroponics Pasture that houses animals for botany. The Chef and Botanists have access to this area.
- Theatre was removed from the bar, replaced with bar. Chef was given an area to lay food out on, and more tables were added for sitting at. Had to move some disposal pipes around and the nav beacons. *crosses fingers* They probably work?
- Removed dispatcher uniform from closet, since it is being used as a general replacement security uniform. And that made Chinsky mad...
- Fixed airless tiles under airlocks.
- Replaced duplicate medical records computer behind medbay desk with Nanomed Plus.
- Pun Pun now has a different monkey sprite from the rest.
2013-05-29 20:24:29 -07:00
VitrescentTortoise
2b689fa3f0 Gave nuke agents magboots. 2013-05-28 21:34:26 -07:00
cib
aa6bfc33c7 Airlock and APC changes.
- Added a debugger device that can figure out when an object has been hacked/emagged
- Hacked APCs no longer display blue screen
- You can now disassemble emagged airlocks, they will yield a fried airlock electronic.
2013-05-23 16:43:29 +02:00
Chinsky
1b0c6b942a NOW IT COMPILES.
Incomplete rename.
2013-05-21 18:08:28 +04:00
Mloc
5faabba7fb Merge branch 'master' into bleeding-edge-freeze
Conflicts:
	html/changelog.html

Signed-off-by: Mloc <colmohici@gmail.com>
2013-05-16 12:21:55 +01:00
fauxtada
2b9130b00f Quick Fixes
- Changed access to security washroom so detective can go in.
- Removed wall that was under maintence tunnel door.
- Fixed writerer's custom item. AGAIN. .. Because they can't decide what character they want it on.
- Added saloon dress to bar closet.
2013-05-15 11:26:26 -07:00
Cael_Aislinn
749d3eeaa0 transit pods should reverse direction when they reach the end of the tube
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-05-14 13:10:28 +10:00
fauxtada
5b2f03db10 Map Fixes - BEF
- adjusts the piping and flooring panels in the new security wing.
- fixes the piping around the new eva since they lead to nowhere.
- adjusted the medbay lobby a bit, added a second chair behind the front desk.
- added in a xenos closet. has unathi items / wooden sandals in it currently. still need to sprite up the tajaran and skrell items.
2013-05-11 09:33:45 -07:00
Mloc-Argent
849ec5052a Fix for compiling on case sensitive filesystems.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-05-06 16:09:10 +01:00
Mloc-Argent
27759f47df Merged master into BEF.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-05-06 15:43:50 +01:00