Datraen
459f70ba46
Merge pull request #1319 from Mark9013100/3/31/2016medweb
...
Adds the medical webbing
2016-04-01 16:53:58 -04:00
Mark9013100
f51a350281
Adds the medical webbing
2016-04-01 08:11:23 -04:00
Mark9013100
d637e6bc8e
Janitor Edits
2016-04-01 04:55:39 -04:00
Mark9013100
1522026190
Detectives now spawn with CSI Kit
2016-03-30 11:50:54 -04:00
Neerti
015c6ef58a
Merge pull request #1284 from Mark9013100/3/29/2016mapfixes
...
Map fixes, minor edits
2016-03-30 02:25:35 -04:00
Neerti
e7c9681c91
Merge pull request #1281 from redstryker/Navy-Blue-Scrubs
...
Adds Navy Blue scrubs
2016-03-30 02:24:07 -04:00
Mark9013100
50a6f53c12
Map fixes, minor edits
2016-03-29 10:50:22 -04:00
redstryker
7a437e12f5
Adds Navy Blue scrubs and a navy blue surgical cap. Also adds them to the loadout and all appropriate lockers.
2016-03-28 23:53:38 -04:00
Mark9013100
f57eef764f
Bedsheets can be worn as capes
2016-03-28 22:01:37 -04:00
Mark9013100
26358bf1ab
Map edits, minor fixes
2016-03-28 00:02:20 -04:00
Neerti
0844d0b9f0
Merge pull request #1239 from Mark9013100/3/23/2016layering
...
Layering fixes for bedsheets/curtains
2016-03-26 17:06:54 -04:00
SinTwo
b356f5cf21
Construction Update
2016-03-25 16:02:36 -04:00
Mark9013100
200057397a
Layering fixes for bedsheets/curtains
2016-03-23 16:19:41 -04:00
Neerti
a9ad84da4b
Merge pull request #1191 from Kelenius/inventoryCleanup
...
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
Datraen
996ce92f7f
Merge pull request #1184 from Yoshax/510prep
...
Ports Byond 510 preperations from Bay
2016-03-20 13:45:40 -04:00
Kelenius
afbc235b96
Mob inventory cleanup
2016-03-15 16:39:40 +03:00
Mark9013100
a8d90003ca
Ports /tg/'s warden locker sprite
2016-03-15 06:49:25 -04:00
Yoshax
8be10d96dd
Ports Byond 510 preperations from Bay
...
Updates comment
Updates supply file
2016-03-14 18:21:44 +00:00
Neerti
ccb6f5bd60
Merge pull request #1132 from Hubblenaut/laundry
...
Laundry Basket
2016-03-14 08:40:43 -04:00
Yoshax
d64bfb3235
Actually fixes the underwear wardrobe
2016-03-12 02:22:34 +00:00
Yoshax
ea32fb2bd0
Fixes errors
2016-03-12 01:53:02 +00:00
Yoshax
b2916bbb56
Splits underwear into top and bottom
2016-03-11 19:26:50 +00:00
Datraen
addbfe11d5
Merge pull request #1153 from Hubblenaut/windowverbs
...
Window Verb Fix
2016-03-10 15:23:12 -05:00
Hubblenaut
c7c5e22717
verb shows on playermade windows
2016-03-10 17:06:09 +01:00
Hubblenaut
51a6241fdd
Merge remote-tracking branch 'upstream/master' into laundry
2016-03-09 15:56:16 +01:00
Neerti
7b9f011d10
Merge pull request #1135 from Mark9013100/3/8/2016clothinglockeredits
...
Adds departmental bags to wardrobes
2016-03-08 21:10:37 -05:00
Mark9013100
bba0d7e786
Adds departmental bags to wardrobes
2016-03-08 16:37:30 -05:00
Hubblenaut
f122902b84
Adds laundry basket
...
Conflicts:
icons/mob/items/lefthand.dmi
icons/mob/items/righthand.dmi
2016-03-07 20:28:41 +01:00
Hubblenaut
49d7f0ee3b
Window verbs update, wrench noise on dismantling
2016-03-07 19:12:59 +01:00
Neerti
b4b8d94723
Merge pull request #1015 from Zuhayr/xenosremove
...
Removes xenormorphs.
2016-03-04 12:34:13 -05:00
Neerti
6224e978a9
Merge pull request #1014 from Zuhayr/voxremove
...
Removed the Vox Pox.
2016-03-04 12:32:23 -05:00
Kelenius
b9a9a7eb88
Merge branch 'master' into botFixes
2016-03-01 14:48:24 +03:00
Hubblenaut
c22f9b2996
Merge remote-tracking branch 'upstream/master' into cash
2016-02-21 17:48:19 +01:00
Datraen
f9054370c1
Merge pull request #1046 from Sabess/Sab_Thing
...
Maglights 2.0: Conflict Boogaloo
2016-02-21 11:30:34 -05:00
Hubblenaut
60f5358751
All cash now acts like bundles
2016-02-21 17:23:54 +01:00
PsiOmegaDelta
36c99aecae
Closet breakout no longer failes early.
...
Caused by req_breakout() always making us quit early if we're already breaking out.
Breakout sound/animation now play after the checks.
Fixes the secure locker break_open() override, which wouldn't update the welded flag and thus keep you imprisoned.
Fixes a couple of bad macros.
2016-02-21 13:57:03 +00:00
PsiOmegaDelta
afdafb3862
Makes the into-resist proc solely responsible for checking click delays.
...
Because it sets the click cooldown itself downstream procs fail when they in turn check the click delay.
Fixes #11839 . Fixes #12062 . Fixes #12114 .
2016-02-21 12:45:01 +00:00
sabess
cb1e26ec70
Fixed conflicts with another thing.
2016-02-21 22:48:56 +11:00
Neerti
93dd32f1b2
Merge pull request #1037 from Yoshax/dolladolla
...
Changes predefined space cash stacks to be bundles
2016-02-21 04:48:00 -05:00
Zuhayr
ebd2360f43
Merge pull request #1004 from Kelenius/master
...
Monkey cubes now expand in showers
2016-02-21 17:49:46 +10:30
Yoshax
76db1f5e6c
Changes predefined space cash stacks to be bundles
...
Fixes #926
2016-02-21 02:16:14 +00:00
Mark9013100
8b84695598
Z1/2 Fixes & Edits
2016-02-20 17:55:05 -05:00
Zuhayr
cbc506fd51
Removed xenomorphs.
2016-02-20 11:50:18 +10:30
Zuhayr
a628ae2a56
Removed the Vox Pox.
2016-02-20 11:24:19 +10:30
Kelenius
a5e4aa33d5
Monkey cubes now expand in showers
...
Port of https://github.com/Baystation12/Baystation12/pull/12107 and
https://github.com/Baystation12/Baystation12/pull/12183
2016-02-18 12:24:38 +03:00
Mark9013100
7d3b5a09b7
Adds the IA jacket/fake sunglasses to custom loadout
2016-02-10 14:16:50 -05:00
Zuhayr
dad8d16136
Allowed pouring reagent containers down the sink.
2016-02-07 21:49:23 +10:30
Zuhayr
7c3993b68b
Revert "Revert "Bay update.""
2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c
Revert "Bay update."
2016-02-07 16:07:05 +10:30
Zuhayr
115eb19d33
Merge branch 'bayupdate' of https://github.com/Zuhayr/Polaris into bayupdate
2016-02-06 14:30:51 +10:30
