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
GinjaNinja32
85373f7c16
fixes #199
2015-12-05 06:03:43 +00:00
Mark9013100
6e0b906e23
Adds Security/Medical cargopacks.
2015-12-03 20:22:12 -05:00
SinTwo
700ee6177b
Clothes Addition, Captain alt title, custom loadout tweakes.
2015-12-03 18:25:45 -05:00
Atlantis
89f5c9f405
Fixes #11540
2015-12-02 11:27:28 +01:00
Zuhayr
4d2db18c70
Added a click delay to interactions with the fire axe cabinet.
2015-12-02 20:38:28 +10:30
PsiOmegaDelta
11e47bc8c2
Fixes being unable to emag secure closets.
...
And ensures that this costs an emag charge.
Also corrects emag_act calls. Partial port of https://github.com/PolarisSS13/Polaris/pull/377 .
2015-12-02 08:30:47 +01:00
Jon
8986c49b82
Fixes emagging for secure closets.
2015-12-01 23:53:50 +00:00
Mark9013100
880ba681e6
Combination of my previous PRs, mostly fixes
2015-11-29 11:13:17 -05:00
PsiOmegaDelta
26f167453c
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-11-22 11:40:44 +01:00
Bjorn Neergaard
ef1f91e334
Fix Laptop Vendors and Personal Lockers not accepting ID Containers
...
Fixes #11092
2015-11-22 00:27:03 -06:00
Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
Neerti
45f15930a0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
...
Conflicts:
.travis.yml
code/_helpers/lists.dm
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
code/global.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/reagents/dispenser/dispenser2.dm
polaris.dme
2015-11-06 17:41:18 -05:00
Chinsky
1417f4f40b
Merge pull request #11344 from Hubblenaut/tape
...
Tape - Sprites and Algorithm Changes
2015-11-02 00:10:03 +03:00
PsiOmegaDelta
a9f7b3a325
Merge pull request #11247 from Hubblenaut/laundry
...
Adds laundry basket
2015-10-31 11:16:14 +01:00
Mark9013100
9b9bcff9de
Brings back the Ausop helmets added in one of my earlier PRs.
...
Brings back the telescopic shield sprite for the back.
And, as an act of ultimate buuuullshit, a corporate detective uniform, with a detective wardrobe(neither of them are mapped in right now).
2015-10-26 21:02:16 -04:00
Hubblenaut
ef591fa2b3
Atmos personal locker spawn with atmos tape roll
2015-10-22 14:31:07 +02:00
