Arokha Sieyes
c4cbe31199
Removes taur suits
2018-05-04 22:16:17 -04:00
Leshana
6756c5a483
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
...
# Conflicts:
# .travis.yml
# code/ATMOSPHERICS/components/unary/outlet_injector.dm
# code/__defines/_planes+layers.dm
# code/__defines/chemistry.dm
# code/__defines/mobs.dm
# code/_helpers/mobs.dm
# code/_onclick/hud/robot.dm
# code/game/area/areas.dm
# code/game/machinery/computer/supply.dm
# code/game/machinery/cryopod.dm
# code/game/machinery/doors/airlock.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/devices/communicator/messaging.dm
# code/game/sound.dm
# code/game/supplyshuttle.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/events/event_container.dm
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/language/language.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/human_powers.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/species_shapeshift.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_powers.dm
# code/modules/mob/living/say.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/logout.dm
# code/modules/mob/mob_helpers.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_icon.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_containers/syringes.dm
# code/modules/shuttles/shuttle.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/wildwest.dm
# maps/southern_cross/items/clothing/sc_head.dm
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-03-31 09:20:59 -04:00
Anewbe
acac33ca39
Removes some problematic HIDEJUMPSUIT flags
2018-03-21 19:12:14 -05:00
Leshana
a0de41f24f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
...
# Conflicts:
# README.md
# code/__defines/mobs.dm
# code/__defines/subsystems.dm
# code/_helpers/global_lists.dm
# code/controllers/subsystems/garbage.dm
# code/controllers/subsystems/overlays.dm
# code/datums/datacore.dm
# code/datums/supplypacks/munitions.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/weapons/id cards/station_ids.dm
# code/game/objects/random/random.dm
# code/game/turfs/simulated/floor.dm
# code/game/turfs/simulated/floor_icon.dm
# code/modules/awaymissions/gateway.dm
# code/modules/client/preferences.dm
# code/modules/ext_scripts/python.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/life.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/mob/living/living.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/mob/new_player/preferences_setup.dm
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/robolimbs.dm
# code/modules/reagents/reagent_containers/glass.dm
# code/modules/reagents/reagent_containers/syringes.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-4.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-03-15 22:41:14 -04:00
Anewbe
5212fa152b
Species names should now use defines
2018-03-15 20:24:45 -05:00
Arokha Sieyes
53a185f838
U_I Phase 2.0: Code cleanup
...
Removing calls to update_icons_layers and the like, stubbing them to help track down future calls.
2018-03-08 19:33:44 -05:00
Arokha Sieyes
68a5fabe11
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/game/objects/items/devices/translator.dm
# code/game/objects/items/weapons/dna_injector.dm
# code/modules/client/preference_setup/loadout/loadout_ears.dm
# code/modules/mob/living/simple_animal/aliens/hivebot.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-3.dmm
2018-03-03 13:09:57 -05:00
Schnayy and Anewbe
36236e1883
Sivian Western Sprite Pack ( #4970 )
...
* Adds: flamenco dress, bustle dress, cowboy duster, sheriff badge, tiny cowboy hat. To be added: 2 pairs of cowboy boots, stick horse.
* Adds 2 cowboy boots and a stick horse. yeehaw.
* Attempting to squash conflict that was caused by one of my OWN prs. For shame.
* attempting to fix conflict ft. anewbe
2018-02-27 14:24:20 -06: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
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
4c38647095
Further progress
2018-02-17 15:14:27 -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
Anewbe and Atermonera
6e215396d7
Removes the Explorer hood lights ( #4787 )
2018-02-11 18:54:17 -08:00
Leshana
1d0f5262d8
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
...
# Conflicts:
# code/__defines/subsystems.dm
# code/controllers/master_controller.dm
# code/controllers/subsystems/atoms.dm
# code/game/machinery/Sleeper.dm
# code/game/machinery/doors/airlock.dm
# code/game/machinery/vr_console.dm
# code/game/objects/items/devices/communicator/phone.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin_verbs.dm
# code/modules/mob/living/carbon/carbon.dm
# code/modules/multiz/movement.dm
# code/modules/projectiles/gun.dm
# code/modules/shuttles/shuttle.dm
# code/modules/shuttles/shuttles_web.dm
# icons/obj/doors/doormed.dmi
# maps/southern_cross/items/headset_sc.dm
# maps/southern_cross/southern_cross-3.dmm
# vorestation.dme
2018-02-07 19:30:50 -05:00
Burrito-Justice and Anewbe
e813ce4666
Updates all medical sprites to Bluebay ( #4712 )
...
* Updates all medical sprites to bluebay
* Forgot Odysseus w h o o p s
* heck forgot to change thing
2018-02-06 23:11:09 -06:00
Anewbe
441bb3430e
Corrects some small mistakes
2018-02-05 19:34:33 -06:00
Anewbe
c30d1ca57b
Tweaks the Explorer suit
2018-02-05 18:01:11 -06:00
Leshana
805897eafb
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-20
2018-01-21 00:23:00 -05:00
mistyLuminescence and Atermonera
a190ec5725
Allows modkits to be created for any item. ( #4450 )
...
* Adds modular modkits
* Adds explorer suit functionality to voidsuit modkits.
2018-01-19 18:11:28 -08:00
Cyantime
9e573e69fb
Updates paths due to Polaris change
2017-12-25 22:31:01 -05:00
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
Anewbe
ff1103c7d9
Removes the military clothing from the loadout, repaths things
2017-12-07 21:21:05 -06:00
Neerti and GitHub
c4e19538b0
Merge pull request #4371 from Anewbe/phoron_contamination
...
Contaminated items now respect gloves
2017-11-30 20:43:27 -05:00
Mechoid and GitHub
6d95e19274
Merge pull request #4361 from Anewbe/explorer_headlight
...
The Explorer Hood now has a headlight
2017-11-29 10:51:24 -08:00
Anewbe
37101b9b39
Contaminated items now respect gloves
2017-11-28 23:56:13 -06:00
Anewbe
4dbc80f5d4
The Explorer Hood now has a headlight
2017-11-27 16:52:26 -06:00
Anewbe
1d73ff684c
Winter coats cover legs, winter boots do not
2017-11-26 22:01:42 -06:00
Neerti and GitHub
2de2391f3c
Corrects block chance on alien armor.
2017-11-26 16:01:15 -05:00
Neerti
01aaccf893
Finishes UFO PoI
2017-11-26 15:10:25 -05:00
Neerti
5b0b639377
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 11/26/2017_ufo_poi
...
# Conflicts resolved:
# maps/submaps/cave_submaps/cave_areas.dm
2017-11-26 12:09:55 -05:00
Neerti
7497aef295
work
2017-11-26 12:08:05 -05:00
Neerti
8ac2100fa2
Adds Exploration Equipment
...
Ports and tweaks the Explorer gear from /tg/. Recolored to remove the mining purple, instead its now a nice blue because winter, I suppose.
Adds a new survival knife that is bootknife ready.
Replaces xenoarch GPS with budget /tg/ GPS that is more useful, as it can track other GPSes.
2017-11-24 07:22:35 -05:00
killer653
9f067a375b
Fixes a few borked teshari cloaks
2017-11-19 00:09:45 -05:00
killer653
11c195debb
Polaris Sync
2017-11-04 13:37:13 -04:00
Verkister
26ea6ec92d
Enables the combo blend mode for most colorable loadout gear.
...
-The most meaning the colorable uniforms, suits, gloves, shoes, headgear, earwear, and accessories.
-Only affects mob icons for now, the inventory/floor icons still in old blend.
-Sort of a framework for possible additional options to come.
-Also messed around with some other stuff such as adding on-ear icons to the rest of the flower pins and bows, and made the base icons for the beanies lighter than the middle gray they were.
2017-11-02 15:33:52 +02:00
killer653
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
Anewbe
9135341847
Steals Bays modular armor, for later use
2017-10-19 23:32:33 -05:00
Anewbe
90a1b1c851
Adds the NRTI hoodie
2017-10-17 14:19:08 -05:00
killer653
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
mistyLuminescence and Anewbe
f87a6d7d8c
Adds a white robe. ( #4074 )
...
* - Adds a hooded robe themed after the Rishizirr, the mythological Tajaran angels of death said to shepherd the souls of those who die while snowed in to their designated afterlife. Perfect for Hallowe'en!
* Adds a hooded white robe.
* Fixes the white robe.
* Fixes the robe, again
2017-10-16 04:27:03 -05:00
Belsima and Anewbe
e97124bb6c
Minor grammar fixes + cold protection. ( #4044 )
...
* Removes extra space.
* Grammar fixes + cold protection.
2017-10-12 22:51:16 -05:00
Cameron Lennox
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
Anewbe
a3534ab339
Ports Bay's Vox Scrap armor, moves some clothing files
2017-09-27 20:11:37 -05:00
Spades
07762f31e7
Some disorganizes changes by Aces
...
- UNSC is now USDF.
- .32 is now .380 instead.
- Added giskard to random gun spawns.
- Changed oliva to be a subtype of giskard.
- Rebalanced random gun spawner and added things.
- Detective no longer spawns with a pistol. It's in your locker instead.
- `SMG_sol` is now just `sol`.
- Fixed some ammo pathing to be consistent.
- Moves Asset Protection spawn point inside the big armory at CentCom.
- Adds a door in CentCom to let the ERT area actually be reached from
CentCom's bridge.
2017-09-21 03:22:20 -04:00
Spades and GitHub
1115d2d566
Merge pull request #2166 from Neopatra/Neopatra-Taursuits
...
Neopatra's taursuits
2017-09-16 18:56:45 -04:00
Neopatra and GitHub
cd24d54ba5
Adds Bio/Rad/Bomb Taursuits
...
Biosuits currently only fit Nagas.
2017-09-16 13:02:15 -04:00
killer653
bddfa16f82
Polaris sync
2017-09-15 21:17:34 -04:00
Neerti
8f00965cc2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again
...
# Conflicts fixed:
# code/modules/admin/topic.dm
# code/modules/admin/verbs/debug.dm
# code/modules/admin/view_variables/helpers.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/transform_procs.dm
# maps/northern_star/polaris-1.dmm
# polaris.dme
2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2
work
2017-09-04 21:52:47 -04:00
Spades
a55d4c5e4c
Imperial Military Update
...
Adds Imperial stuff for our space elf romans.
2017-09-02 04:07:25 -04:00
Arokha Sieyes