Zuhayr
dabd0866a2
As above.
2013-08-28 23:34:12 -07:00
Zuhayr
c17347ef77
Added CubeJackal's security gear to the appropriate lockers.
2013-08-28 22:31:22 -07:00
meyar
c0d264fed7
Fixes fire lockers. They actually start with stuff in them.
2013-08-23 20:39:08 -04:00
meyar
48dafb1904
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-23 20:02:16 -04:00
Segrain
40909bde53
Deconstruction fix.
2013-08-23 15:31:37 +03:00
Zuhayr
2cf9a18f9e
Merge pull request #3572 from Baystation12/master
...
Merging master into dev.
2013-08-22 23:01:15 -07:00
Zuhayr
493dded8fb
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-22 15:29:59 -07:00
Segrain
57c1a9a556
Code cleanup.
2013-08-22 10:11:49 +03:00
Mloc-Argent
5cee2d2ac2
Species will no longer draw hair not allowed for them. Mirrors will no longer let you choose disallowed hair styles.
2013-08-21 23:26:59 +01:00
Mloc-Argent
1e980a9cc1
Merge branch 'master' into dev
2013-08-15 15:29:53 +01:00
Zuhayr
d937900d13
Compile fix.
2013-08-14 10:29:17 -07:00
Zuhayr
1c30387a44
Merge resolution in Engineering.dm
2013-08-14 10:05:55 -07:00
Zuhayr
033b0450a0
Engineering merge.
2013-08-14 20:00:38 -07:00
DJSnapshot
cb20332de5
Added potential for chief engineer's locker to spawn with either a brown vest or webbing
2013-08-13 16:16:20 -07:00
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
