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
8f8c41a7c1
SYNC: Correct vorestation closets/crates to use new system
2018-05-27 19:33:34 -04: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
813d7bf643
Merge branch 'virgoMaster' into virgoPull
2018-05-19 17:16:17 -07:00
bdfa34c911
SSAO object excludes
...
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:54:10 -04:00
91f0c05a4b
SSAO object excludes
...
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:38:22 -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
8c5dc66a13
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor
2018-02-21 23:33:17 -06:00
25a1f47a30
Headset sprites, planetside headset functionality ( #4869 )
2018-02-20 12:36:22 -08:00
5967bb6dc5
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/game/objects/items/weapons/storage/boxes.dm
# code/game/objects/items/weapons/storage/storage.dm
# code/modules/mob/living/carbon/human/species/species.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-6.dmm
2018-02-18 00:25:36 -06:00
cce3c607f2
HoS/Warden helmet tweaks
2018-02-17 15:57:26 -06:00
b7658d49ab
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor
2018-02-17 15:22:28 -06:00
7cc8fa0cba
Gives Miners shinybits. ( #4840 )
...
* Gives miners marker beacons, moves their locker to another file
* Makes marker beacons ITEM_SIZE_SMALL
2018-02-17 11:19:48 -08:00
5c9fd04ed3
Fixes some goofs
2018-02-17 01:19:57 -06:00
7ed3d2c2f6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
...
# Conflicts:
# code/_onclick/hud/screen_objects.dm
# code/game/objects/items/weapons/storage/storage.dm
# code/game/objects/structures/crates_lockers/closets/secure/medical.dm
# code/modules/admin/admin_verbs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/gloves/color.dm
# code/modules/lore_codex/codex.dm
# code/modules/mob/living/simple_animal/aliens/alien.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/goose.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/mob_defines.dm
# code/modules/projectiles/projectile/special.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-7.dmm
# vorestation.dme
2018-02-17 00:35:29 -05:00
7ee2b5266a
Shuttle Upgrades and Map Fixes
...
- Upgrades the shuttles with enviroment sensors and the ability to see if the rear hatch is open.
- Gun cabinets station side in the hangar control rooms. Explorer, Pilot, Armory Access.
- Surgery room redesign, replaced closets with wall closets.
- Multiple other smaller map bug fixes.
2018-02-06 22:58:44 -08:00
4f98fad36b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
...
# Conflicts:
# .travis.yml
# code/_away_mission_tests.dm
# code/modules/admin/verbs/mapping.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# nano/images/nanomap_z1.png
# nano/images/nanomap_z10.png
# nano/images/nanomap_z2.png
# nano/images/nanomap_z3.png
# nano/images/nanomap_z5.png
# nano/images/nanomap_z6.png
2018-02-01 23:55:47 -05:00
f68cf380ae
Gun Cabinet hotfix
...
- Should fix explorers not being able to get into their gun cabinets
2018-01-31 23:13:30 -08:00
09eb4054a5
Removes hypospray/vr and vial/vr
2018-01-18 19:01:26 -05:00
ff228754b3
Merge polaris sync 01 17 2018
...
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
1f595cd59a
Two interface QoL changes (closets and mechs)
2018-01-14 03:58:15 -05:00
ff02218ccb
Hatchets - > Machete subtype.
2018-01-12 21:21:18 -08: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
d998f36c38
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018
...
# Conflicts:
# code/game/objects/structures/signs.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/organs/organ_icon.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2017-12-26 23:07:58 -05:00
c986d57c34
Med Pill Blue Pill ( #4404 )
...
* Fixes 4412
* Rebalanced medical gear spawns
* Pill bottle code touched up
2017-12-23 14:45:24 -08:00
463b9c4dfb
Edited files
2017-11-17 19:28:26 -05:00
0431c2d23c
Changes the old hyposprays to the new hyposprays. ( #4223 )
...
* Hypospray mk1 -> Hypospray mk2
* Medical random spawns no longer have the new hypo.
* Medic syndiecrate now has the old hypo
2017-11-15 16:31:50 -06: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
11c195debb
Polaris Sync
2017-11-04 13:37:13 -04:00
41f332df42
fuck this pr PART TWO
2017-11-04 00:00:07 +00:00
a0c5ecb8d5
UPDATES IT FOR REAL THIS TIME
2017-11-03 23:29:14 +00:00
6611cb271b
Merge pull request #4190 from mistyLuminescence/plushierework2561
...
Plushie tweaks!
2017-11-01 21:57:56 -05:00
f67a3858cd
Plushie tweaks!
2017-10-31 15:47:00 +00:00
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
073fd9524c
Adjusts outfits again
2017-10-25 02:24:15 -05:00
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
392aa1d8bc
Makes the new T-Ray Scanners available
2017-10-11 17:11:49 -04:00
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
8aed98be14
Adds science dufflebag
2017-10-05 16:26:56 -04: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
79c5018dfa
Adds medical tape to paramedic and CMO locker
2017-09-12 14:54:06 -04:00
TheFurryFeline