Neerti
554adc1743
Merge pull request #1467 from Nerezza/ParaDuffels
...
Adds EMT Duffelbags
2016-04-21 21:08:19 -04:00
Nerezza
24cd704115
Adds EMT Duffelbags
...
Sprites EMT variation of medical duffels and places them into the bottom of their locker.
2016-04-21 16:37:43 -05:00
Kelenius
98badae45f
Merge branch 'master' into cleanupTwo
2016-04-21 11:41:32 +03:00
Mark9013100
2accd60a5b
Moves detective clothing from the cabinet to wardrobe
2016-04-15 13:27:28 -04:00
Datraen
e1c0256477
Brings the jumpsuits, pants, shorts, ponchos and hoodies under the path system.
2016-04-05 14:44:31 -04:00
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
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
26358bf1ab
Map edits, minor fixes
2016-03-28 00:02:20 -04:00
Mark9013100
5f734effbc
Armor can now hold maglights
2016-03-23 20:14:56 -04:00
Kelenius
df5a0d7941
Mob inventory cleanup
...
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Mark9013100
a8d90003ca
Ports /tg/'s warden locker sprite
2016-03-15 06:49:25 -04:00
Hubblenaut
51a6241fdd
Merge remote-tracking branch 'upstream/master' into laundry
2016-03-09 15:56:16 +01: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
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
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
Mark9013100
7d3b5a09b7
Adds the IA jacket/fake sunglasses to custom loadout
2016-02-10 14:16:50 -05:00
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
Mark9013100
3853f34941
Makes the new security badges holobadges
2016-02-03 16:37:19 -05:00
Kelenius
cf244e07d6
Mulebots are now mobs
...
obj/machinery/bot removed completely
Mulebot hacking removed, you can still disable their safety.
Mulebot PAD interface redone.
2016-02-02 17:51:50 +03:00
Zuhayr
f31438bd77
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate
2016-01-30 08:49:35 +10:30
Mark9013100
51a9cef15f
Adds more security badges/medals
2016-01-28 00:33:49 -05:00
Kearel
5727971690
Semi ports Baystation12/Baystation12#11445
2016-01-25 20:35:52 +00:00
Zuhayr
e557a71fdc
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2016-01-20 08:01:14 +10:30
Mark9013100
21778fc92e
Adds portable freezers to med lockers
2016-01-12 19:23:25 -05:00
Zuhayr
0c2ec6422a
Merge pull request #727 from Mark9013100/1/3/2016edits
...
Edits/Changes, 1/3/2016
2016-01-12 04:31:38 +10:30
Zuhayr
baf1e4315e
Generalized pulling restrictions to mob level.
2016-01-08 23:20:30 +10:30
Mark9013100
91f191e800
Edits/Changes, 1/3/2016
2016-01-03 20:21:34 -05:00
Mark9013100
cbbafa5170
Adds the black scrub cap
2015-12-21 12:25:43 -05:00
woodratt
e24745b002
-1.3.3.-
...
- Strategical headsets added to the merc outpost.
- Cargo Bowman headset sprites added. Added to cargo lockers.
- Cargo Technicians lockers have a 25% chance of spawning dufflebags
- ERT bowman headsets added to ERT area.
- Doors added to ERT area.
2015-12-13 23:40:07 -08:00
Mark9013100
09b9be4b72
Adds a detective belt and other edits for security
2015-12-11 22:43:13 -05:00
Datraen
ef0337fccf
Refactors Telecrystals into individual pools, adds a new command to allow for admins to modify telecrystal levels.
2015-12-11 21:14:11 -05:00
Neerti
f28a0405a8
Merge pull request #513 from Hubblenaut/tape
...
New Police Tape Icons and Placing Algorithms
2015-12-10 19:51:09 -05:00
Hubblenaut
d4766aa09a
Atmos personal locker spawn with atmos tape roll
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
2015-12-10 19:27:04 +01:00
Zuhayr
565e39a28f
Porting forensics from Aurora.
2015-12-10 19:16:28 +10:30
PsiOmegaDelta
6a22086c17
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/verbs/suicide.dm
code/modules/nano/modules/crew_monitor.dm
2015-12-06 11:34:36 +01:00
