c7ab1e76b3
Merge pull request #712 from kcin2001/teshhood
...
makes it so tesh hoods hide hair
2019-06-06 19:33:47 -07:00
fb7e0fa99e
makes it so hoods hide hair
...
makes it so hoods hide hair
2019-06-06 15:52:25 -07:00
67cafffac5
Teshari Security Cloak armor
...
Teshari Security Cloak has 1:1 stats with security armor vest.
2019-05-26 12:50:21 -07:00
aff9863d70
Merge pull request #676 from kcin2001/teshhood
...
fixes black and red hooded cloak hood
2019-05-18 12:40:27 -05:00
49e54c9743
fixes black and red hooded cloak hood
2019-05-17 19:47:05 -07:00
f298e59c98
Merge pull request #660 from kcin2001/teshhood
...
adds hooded cloaks for teshari
2019-05-04 17:15:24 -05:00
2656ee9fa3
adds hooded cloaks for teshari (identical mechanically to the normal cloaks just with a hood)
2019-05-03 21:53:29 -07:00
d834358d7c
-Added 'dark aesthetic' retrowave teshari cloak
...
-Added sprites for said cloak
-Added cloak to the black teshari cloaks supply pack
2019-04-04 19:45:17 -05:00
b5e428443e
One final grammar fix.
2019-03-20 23:52:39 -05:00
ae24074361
This should restrict job teshari cloaks/undercloaks by redefining all normal cloaks/undercloaks to 'standard' and redefining the cloak/undercloak loadouts to only draw from standard clothing.
2019-03-20 23:05:51 -05:00
743ee45b75
Fixed several errors which existed in the port.
...
-IAA and Service cloaks should have icons now
-Fixed spelling mistakes in Engineering and Quartermaster cloaks
2019-03-20 22:41:50 -05:00
36fabeb786
Missed some indents.
2019-03-20 21:44:56 -05:00
86363b93fe
Yawn-Wider port
...
-Adds sprite for black and glowing tesh cloak
-Adds object for black and glowing tesh cloak
-Adds black and glowing tesh cloak to black tesh cloaks supply pack
2019-03-20 21:33:10 -05:00
f8c3250a78
-Adds tesh department cloaks/undercoats as objects
...
-Allows department cloaks/undercoats to be chosen from loadout
2019-03-20 21:12:36 -05:00
80e33e4267
Fixed incorrect proc error
2019-01-19 21:40:40 +00:00
ec0d3e135a
The following items now have some functions triggered by alt click.
...
- Flashlight
- geiger counter
- T ray
- Labcoats and such
- Microwave
Feel free to suggest more.
2019-01-19 20:42:01 +01:00
bff9f560f7
Replaced all blue font with a custom colour
2019-01-18 15:14:32 +00:00
1c3adfacab
HoS Armor Nerf
...
The HoS armored coat was too powerful compared to other armors. The numbers have been brought down a little, but are still slightly superior to standard security vests. The head of security vest, however, was only slightly nerfed with melee being reduced by five. It keeps its superior bullet and energy protection, but bomb protection is being reduced to 15 to be just a little better than regular security vest.
Here are a list of comparison screenshots. Might need more reviews.
https://cdn.discordapp.com/attachments/405257702663782400/534594080521584661/Armor_1_Vest.PNG
https://cdn.discordapp.com/attachments/405257702663782400/534594118400213002/Armor_2_HoS.PNG
https://cdn.discordapp.com/attachments/405257702663782400/534594145436565507/Armor_3_Voidsuit.png
https://cdn.discordapp.com/attachments/405257702663782400/534594721503510533/Armor_4_New_Hardsuit.PNG
https://cdn.discordapp.com/attachments/405257702663782400/534595864317001728/Armor_5_Proposed_Trenchcoat_changes.PNG
2019-01-14 23:06:20 -07: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
80ffd86b0e
Change accessories to use bitflags
...
Allows accessories to 'block' multiple slots
2018-05-22 15:55:22 -04:00
c4cbe31199
Removes taur suits
2018-05-04 22:16:17 -04:00
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
acac33ca39
Removes some problematic HIDEJUMPSUIT flags
2018-03-21 19:12:14 -05:00
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
5212fa152b
Species names should now use defines
2018-03-15 20:24:45 -05:00
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
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
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
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
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
4c38647095
Further progress
2018-02-17 15:14:27 -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
6e215396d7
Removes the Explorer hood lights ( #4787 )
2018-02-11 18:54:17 -08:00
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
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
441bb3430e
Corrects some small mistakes
2018-02-05 19:34:33 -06:00
c30d1ca57b
Tweaks the Explorer suit
2018-02-05 18:01:11 -06:00
805897eafb
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-20
2018-01-21 00:23:00 -05:00
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
9e573e69fb
Updates paths due to Polaris change
2017-12-25 22:31:01 -05:00
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
ff1103c7d9
Removes the military clothing from the loadout, repaths things
2017-12-07 21:21:05 -06:00
c4e19538b0
Merge pull request #4371 from Anewbe/phoron_contamination
...
Contaminated items now respect gloves
2017-11-30 20:43:27 -05:00
6d95e19274
Merge pull request #4361 from Anewbe/explorer_headlight
...
The Explorer Hood now has a headlight
2017-11-29 10:51:24 -08:00
37101b9b39
Contaminated items now respect gloves
2017-11-28 23:56:13 -06:00
4dbc80f5d4
The Explorer Hood now has a headlight
2017-11-27 16:52:26 -06:00
1d73ff684c
Winter coats cover legs, winter boots do not
2017-11-26 22:01:42 -06:00
2de2391f3c
Corrects block chance on alien armor.
2017-11-26 16:01:15 -05:00
01aaccf893
Finishes UFO PoI
2017-11-26 15:10:25 -05:00
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
Razgriz
