93c4c2b5cf
Closet Access Tweak
...
Add an additional level of access to command secretary locker so secretaries can actually access it when needed.
2019-05-31 00:32:07 -04:00
2703c81029
Command Secretary Closet
...
HOP access, allows for distribution of extra headsets if needed.
2019-04-07 16:18:50 -04:00
635013f331
Merge branch 'virgoMaster' into virgoPull
2018-06-10 12:33:29 -07:00
2d89d63c09
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/l3closet.dm
# code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
# code/game/objects/structures/crates_lockers/closets/secure/medical.dm
# code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/game/objects/structures/crates_lockers/closets/utility_closets.dm
# maps/southern_cross/structures/closets/misc.dm
# maps/submaps/surface_submaps/wilderness/DoomP.dmm
# vorestation.dme
2018-05-27 19:26:12 -04:00
6b42df0685
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
...
# Conflicts:
# code/__defines/misc.dm
# code/controllers/master_controller.dm
# code/game/machinery/computer3/computers/card.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/stacks/medical.dm
# code/game/objects/structures/signs.dm
# code/modules/admin/admin_verbs.dm
# code/modules/client/client defines.dm
# code/modules/client/client procs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/events/radiation_storm.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_dispenser.dm
# config/example/config.txt
# html/changelogs/.all_changelog.yml
# interface/skin.dmf
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-05-25 13:23:47 -04:00
f9b409549e
Makes closets/crates like boxes
...
Gives them a 'starts_with' (well, renames the existing one. Someone ported it but never actually applied it anywhere).
2018-05-24 17:26:17 -04:00
be73b8c36a
for(var/bad_code in world)
...
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
2018-04-29 17:55:04 -04:00
b52bb9a7f0
Add custom items for Igni/Kelly Summers
2018-04-05 19:11:40 -07:00
30454ccdc3
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
...
# Conflicts:
# code/game/jobs/job_controller.dm
# code/game/machinery/oxygen_pump.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/organs/internal/eyes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-02-23 21:55:42 -05:00
cce3c607f2
HoS/Warden helmet tweaks
2018-02-17 15:57:26 -06:00
5c9fd04ed3
Fixes some goofs
2018-02-17 01:19:57 -06:00
3e754620b6
Some security firearm changes
2018-01-09 20:40:51 -05:00
5c6637cffa
Gives the HoS a KHI-102b NSFW
...
It's just my fluff gun. But sharing is caring.
From the ingame fluff:
"Variety is the spice of life! The 'Nanotech Selectable-Fire Weapon' is an unholy hybrid of an ammo-driven energy weapon that allows the user to mix and match their own fire modes. Up to three combinations of energy beams can be configured at once. Ammo not included."
"This gun is an energy weapon that uses interchangable microbatteries in a magazine. Each battery is a different beam type, and up to three can be loaded in the magazine. Each battery usually provides four discharges of that beam type, and multiple from the same type may be loaded to increase the number of shots for that type."
"The Kitsuhana 'Nanotech Selectable Fire Weapon' allows one to customize their loadout in the field, or before deploying, to achieve various results in a weapon they are already familiar with wielding."
The HoS's includes 2 lethal, 2 stun, 1 net, and 1 ion battery. There are other batteries (like instagib!) but there's no way to get them normally. There's also one that strips people.
2018-01-04 23:57:11 -05:00
70e53b96bb
Polaris Sync
2017-11-10 11:37:41 -05:00
c96781499f
Allows detectives to take an optional revolver + some other stuff ( #4217 )
...
* I'm like 99% sure this works
* uhm
* accidentally broke something after I tested but before I PRed, fixed now
2017-11-05 22:53:11 -06:00
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
073fd9524c
Adjusts outfits again
2017-10-25 02:24:15 -05:00
bddfa16f82
Polaris sync
2017-09-15 21:17:34 -04:00
fb0e4d3cf9
General uniform updates. ( #3814 )
...
* General uniform update.
* Maps in bathrobe.
* Revert "Maps in bathrobe."
This reverts commit 9cbe47671da7a452cb5ac040aeefdcb98dbe180a.
* Fixes cheongsams and maps in the bath robe.
* Removes unintentionally added sprite.
* Assorted bugfixes.
2017-09-15 17:14:20 -05:00
468e73c7f3
Polaris sync
2017-08-06 19:07:17 -04:00
3db35eb684
Dakka Dakka
...
- Removed gun_vr judge, Polaris has one now.
- Removed vorestation m44 mags, Polaris has those now.
- Removed detective's .44 magnum because NO YOU CANNOT HAVE A FUCKING
MAGNUM
- Corrected inconsistent naming of .44 speedloaders
- Corrected inconsistent naming of .357 speedloaders
- Fixed broken calibers for .357 stuff to be consistent with upcoming
Polaris sync.
2017-06-30 22:42:08 -04:00
df7d0eb05f
.dm file changes first
2017-06-19 22:29:24 -04:00
9d1e00966f
Update security.dm
...
Fixes the detective locker speedloaders for real this time.
2017-06-11 23:35:13 -04:00
a930c2c0d4
Add files via upload
2017-06-10 23:29:03 -04:00
7f773b0099
Adds Winter boots for every department! Adds said boots to the loadout. Adds boots to all the closets and wardroves that had winter jackets. Adds boots and jackets to some closets that had neither and fitted in.
2017-06-05 16:46:54 -03:00
c4bdc4c027
Updated VOREStation specific files for the ammo path reorganization.
...
* Updated paths in dm files
* Updated references in all dmm files for tether, virgo, and randomz
2017-06-02 12:18:13 -04:00
197a648795
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/multiz/movement.dm
# code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
8579adcc53
Naming convention of ammo is now consistent
...
s = Speedloaders. (Functionally the same as clips, but they're not
_really_ the same thing, just in case we change these later.)
c = Clips. (Can also be used to fill other magazines.)
m = Magazine. (Holds ammo rounds.)
a = Ammo. (Individual rounds of ammo.)
2017-05-26 19:32:23 -04:00
5ae26332fa
Merge branch 'master' into aro-tether-wip
...
# Conflicts:
# code/ZAS/_docs.dm
# code/game/area/areas.dm
# code/game/objects/explosion.dm
# code/modules/holodeck/HolodeckControl.dm
# code/modules/mob/living/say.dm
2017-05-16 00:26:32 -04:00
d1b37bf481
Split HoS locker into two
2017-05-09 11:10:14 -04:00
7058806865
Ports 'head' guns from Eris, change Hunter sprite
...
RD: Bluespace Harpoon
HoS: Lamia handgun
HoP: Holdout E-Gun
A few other unused ones included in code.
2017-05-09 02:42:32 -04:00
4fbfa7ee37
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
...
# Conflicts:
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/mob_defines.dm
# html/changelogs/.all_changelog.yml
# vorestation.dme
2017-05-08 21:07:45 -04:00
36decd20b7
Adds icons. Adds skirts to loadout options and closets.
2017-04-30 02:39:27 +01:00
339b269393
Adds 23 new skirt versions of existing suit sprites.
...
Adds them to loadout options and departmental uniform lockers as appropriate.
One new (Old Woman Attire) as equivalent to old man suit.
Some are unused, but now skirt sprites exist.
2017-04-29 12:01:40 +01:00
3f1e5c80f2
Polaris sync
2017-02-01 15:08:45 -05:00
db41b99d17
Adds locker contents for HoS/Warden and a medical sunglasses for CMO
2017-01-27 00:26:52 -06:00
b81c59989b
Fixes all around the map. Edited the security Storage lightly, gave the warden a new desk to hand out stuff. Security Vendor now has Police tape, peper spray, Tasers and stun revolvers. Added Shutters to the Public Gateway acces. Lots of tiny fixes and edits all over the place.
2017-01-18 07:53:20 -03:00
da90b87802
Ports Bay's tape recorders
2016-11-11 00:10:55 -06:00
771d8b9e4b
Adds a smaller device cell for use in non-weapon devices
2016-10-08 15:34:18 -05:00
673e75832a
Merge pull request #2602 from SpadesNeil/death-to-the-administrator
...
Replaces Station Administrator with Colony Director, NASA Approved
2016-10-06 22:31:14 -05:00
2330968176
Replaces Station Administrator
2016-10-06 22:38:02 -04:00
0f51fda83a
Energy weapons can be reloaded
2016-10-06 21:30:52 -05:00
a2a2f58e93
Fixes #2352
2016-08-27 13:44:32 -04:00
4aaa45736d
Tweaks the contents of the captain's closet
2016-08-21 21:22:09 -05:00
6b0704f10f
Adds pepperspray and a crowbar to the HoS locker
2016-07-31 23:05:38 -05:00
56f9e63c64
Adds pockets to the HoS and Warden coats
2016-07-24 15:55:54 -05:00
7b1eb6c099
Refactors specialized satchels as children of the regular (leather) satchel
2016-04-29 18:44:28 -05:00
5d6e129ebf
Adjusts HoS' locker capacity
2016-04-28 21:37:57 +01:00
2accd60a5b
Moves detective clothing from the cabinet to wardrobe
2016-04-15 13:27:28 -04:00
1522026190
Detectives now spawn with CSI Kit
2016-03-30 11:50:54 -04:00
TheFurryFeline