Reddeyfish
813d7bf643
Merge branch 'virgoMaster' into virgoPull
2018-05-19 17:16:17 -07:00
Arokha Sieyes
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
Arokha Sieyes
c4cbe31199
Removes taur suits
2018-05-04 22:16:17 -04:00
Reddeyfish
b52bb9a7f0
Add custom items for Igni/Kelly Summers
2018-04-05 19:11:40 -07:00
Arokha Sieyes
f04c58f202
VS: Rewrites basically all of how bellies work
...
And cleans up a ton of stuff.
2018-02-27 13:29:45 -05:00
Leshana
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
Anewbe
8c5dc66a13
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor
2018-02-21 23:33:17 -06:00
Anewbe and Atermonera
25a1f47a30
Headset sprites, planetside headset functionality ( #4869 )
2018-02-20 12:36:22 -08:00
Arokha Sieyes
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
Anewbe
cce3c607f2
HoS/Warden helmet tweaks
2018-02-17 15:57:26 -06:00
Leshana
ef3df27528
VOREStation Specific Merge Changes
...
* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
2018-02-17 16:56:31 -05:00
Anewbe
b7658d49ab
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor
2018-02-17 15:22:28 -06:00
Anewbe and Atermonera
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
Anewbe
5c9fd04ed3
Fixes some goofs
2018-02-17 01:19:57 -06:00
Leshana
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
Mechoid and Anewbe
251297a2ba
Promethean Balancing, Lore-compliant Modification of Security Equipment ( #4722 )
...
* Works on Balancing Prometheans
* Reorganize from Master Merge
* Tries to fix that gun conflict that the DMI merger apparently did fine?
2018-02-08 14:58:17 -06:00
Woodratt
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
Leshana
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
Woodratt
f68cf380ae
Gun Cabinet hotfix
...
- Should fix explorers not being able to get into their gun cabinets
2018-01-31 23:13:30 -08:00
Cyantime and GitHub
84c3154b2b
Merge branch 'master' into hypo
2018-01-20 01:39:16 -05:00
Leshana
3c3dac7102
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19
...
# Conflicts:
# code/_onclick/hud/hud.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-01-19 17:52:25 -05:00
Woodratt
d1f8e875a8
Southern Cross Bugfixes and additions
...
- Multiple fixes for map errors, and removal of christmas decor
- Addition of a gym station side, deck one
- nav beacons and beepsky added
- overhaul of the centcomm z to look more like the Northern Star
2018-01-18 20:01:01 -08:00
Cyantime
09eb4054a5
Removes hypospray/vr and vial/vr
2018-01-18 19:01:26 -05:00
Arokha Sieyes and Leshana
ff228754b3
Merge polaris sync 01 17 2018
...
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Arokha Sieyes
1f595cd59a
Two interface QoL changes (closets and mechs)
2018-01-14 03:58:15 -05:00
Arokha Sieyes and GitHub
8dae4a6f04
Merge pull request #2725 from VOREStation/aro-bacon
...
Refactor Digestion
2018-01-14 00:07:54 -05:00
Mechoid
ff02218ccb
Hatchets - > Machete subtype.
2018-01-12 21:21:18 -08:00
Arokha Sieyes
449dcbb0b7
Refactor Digestion
2018-01-10 02:06:13 -05:00
Spades
3e754620b6
Some security firearm changes
2018-01-09 20:40:51 -05:00
Arokha Sieyes
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
Arokha Sieyes
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
mistyLuminescence and Atermonera
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
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
Anewbe and GitHub
3b89c5e320
Merge pull request #4384 from Belsima/maid
...
Adds maid bonnet, more hair pins, and adds maid uniform to locker.
2017-12-12 19:51:35 -06:00
mistyLuminescence and Anewbe
4b102b7870
Adds food bags! ( #4389 )
2017-12-07 17:49:59 -06:00
Belsima
0a76047cef
Loadout adjustments.
2017-12-02 08:59:46 -05:00
Neerti
7497aef295
work
2017-11-26 12:08:05 -05:00
killer653
463b9c4dfb
Edited files
2017-11-17 19:28:26 -05:00
killer653
da0bf3743b
Polaris sync
2017-11-17 19:27:03 -05:00
mistyLuminescence and Anewbe
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
killer653
70e53b96bb
Polaris Sync
2017-11-10 11:37:41 -05:00
mistyLuminescence
9dad109f22
Putting wielded fire axes back now works correctly.
2017-11-06 10:27:55 +00:00
Sabess and Anewbe
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
killer653
11c195debb
Polaris Sync
2017-11-04 13:37:13 -04:00
mistyLuminescence
41f332df42
fuck this pr PART TWO
2017-11-04 00:00:07 +00:00
mistyLuminescence
a0c5ecb8d5
UPDATES IT FOR REAL THIS TIME
2017-11-03 23:29:14 +00:00
Anewbe and GitHub
6611cb271b
Merge pull request #4190 from mistyLuminescence/plushierework2561
...
Plushie tweaks!
2017-11-01 21:57:56 -05:00
mistyLuminescence
f67a3858cd
Plushie tweaks!
2017-10-31 15:47:00 +00:00
killer653
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
Anewbe
073fd9524c
Adjusts outfits again
2017-10-25 02:24:15 -05:00
Reddeyfish