Aronai Sieyes and GitHub
15acf6d79d
Merge pull request #3780 from VOREStation/aro-exppermit
...
Corrects explorer permit language
2018-05-28 20:59:33 -04:00
Spades and GitHub
310dcd4d0d
Grammar!
2018-05-28 19:26:56 -04:00
Arokha Sieyes
0d434fadab
Corrects explorer permit language
...
Permit doesn't let them carry guns "on the surface", it lets them carry guns while exploring.
2018-05-28 14:47:07 -04:00
Unknown
8572125d57
Fixes Machete Sheaths
...
- Machete sheath now has proper slot assignment, so it can be worn again.
2018-05-28 12:41:34 -04:00
Arokha Sieyes
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
Atermonera and GitHub
449a495b54
Merge pull request #5299 from Novacat/spriteadd
...
Accessory Fixes
2018-05-26 15:23:54 -07:00
Anewbe
d8f1069689
Adds a number of accessory related null checks
2018-05-25 12:29:33 -05:00
Arokha Sieyes
088eee3d96
SYNC: Compileability fixes
2018-05-25 13:29:30 -04:00
Unknown
39f9fbec1f
Accessory Fixes
...
- Only holsters with utility slot can be unsheathed/sheathed by clicking on the suit (to stop conflicts with webbing)
- Heavy Armor Plates no longer have a bugged/invisible icon
2018-05-25 13:24:00 -04:00
Arokha Sieyes
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
Arokha Sieyes
80ffd86b0e
Change accessories to use bitflags
...
Allows accessories to 'block' multiple slots
2018-05-22 15:55:22 -04:00
Unknown
db739dfc34
Did not work as well
2018-05-22 13:30:37 -04:00
Unknown
2c1ad0076f
Requested Fixes
2018-05-22 12:49:41 -04:00
Unknown
ca131caa10
New Explorer Gear
...
- Adds a new defensive exploration weapon intended for use by rear-line explorers, such as SARs and Pilots
- Ported Machete Sheath from Baystation, intended to be used with the machetes here
NOTE: I intended them to not be usable alongside holsters, but I am not sure how to go about this
- Explorer lockers will now come with a survival knife, machete, and machete sheath
2018-05-22 11:27:48 -04:00
Leshana
e08cbef044
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04
...
# Conflicts:
# code/modules/economy/lorenews.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
2018-04-06 15:40:06 -04:00
Verkister
5d8b6cd1a6
Small Shock/Holo collar tweaks.
...
-Updates their old >> dialogue.
-Makes shock collars taggable.
Was gonna fix them showing up in forced lowercase on people but that turned out to be a separate polaris issue that I just opened a fix for up there.
2018-04-05 15:48:03 +03:00
Verkister and GitHub
94c9d631f9
Fixes custom accessories not showing up on things
...
Contradictory hardcoding babe.
2018-03-24 14:24:44 +02: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
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
Aronai Sieyes and GitHub
2935ec1ac8
Merge pull request #3149 from VOREStation/aro-sync
...
Polaris Sync
2018-02-27 21:48:52 -05:00
Arokha Sieyes and Leshana
3fe17274d2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/ATMOSPHERICS/pipes.dm
# code/game/turfs/flooring/flooring.dm
# code/modules/clothing/clothing_accessories.dm
# code/modules/mob/living/carbon/human/inventory.dm
# html/changelogs/.all_changelog.yml
2018-02-27 21:27:35 -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
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
Schnayy and Anewbe
643ba39d73
Prommie Cohesion Suits ( #4937 )
...
* Adds prommie cohesion suits. Still need tesh sprites + loadout.
* adds the tesh sprites + loadout option.
* Renammed cohesion suits & icon files.
* Almost forgot to adjust the bird file names. There we go.
* Removed redundant line
2018-02-25 11:26:02 -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
Anewbe
8c5dc66a13
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor
2018-02-21 23:33:17 -06:00
Cameron653 and GitHub
f15195cded
Whoops
2018-02-21 16:50:26 -05:00
Cameron653 and GitHub
031c30d06d
Adds a toggle to the bluespace jumpsuit
2018-02-21 16:43:57 -05:00
Anewbe and Atermonera
67261d40f3
Adds planetside gun permits ( #4879 )
2018-02-20 12:37:03 -08:00
Anewbe
4c38647095
Further progress
2018-02-17 15:14:27 -06:00
Anewbe
38cb9bc406
More progress
2018-02-17 13:28:44 -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
1593e4fdeb
Steals more modular armor code
2018-02-16 18:41:07 -06:00
Woodratt
060e1aed18
Clothing adjustments and fix
...
- Utility uniforms can now roll up sleeves
- SAR, Shaft Miner, Explorer can now select webbings in the loadout.
2018-02-09 15:21:15 -08: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
Arokha Sieyes
4432b2dd8b
VS: Adds Destroy on shock collars (tsk tsk)
2018-01-18 18:19:16 -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
atermonera
7f43737a53
Locket desc was too long
2018-01-16 18:48:32 -08:00
Arokha Sieyes
10aabd98da
POLARIS: 3000% human/update_icons() improvement
...
Using overlays in lists and a mutable_appearance
2018-01-15 21:39:47 -05:00
Mechoid
ff02218ccb
Hatchets - > Machete subtype.
2018-01-12 21:21:18 -08:00
Mechoid
5efc484595
Makes knives all knives.
2018-01-12 18:02:07 -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 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
Anewbe
ff1103c7d9
Removes the military clothing from the loadout, repaths things
2017-12-07 21:21:05 -06:00
Belsima and Anewbe
3bf74de3b1
Grammar time, again. ( #4402 )
...
* Shriek grammar.
* Updates jumpsuit grammar.
* Update civilian.dm
* Update NewBan.dm
* Update gravitygenerator.dm
* Update Dreaming.dm
* Update shriek.dm
* Update NewBan.dm
2017-12-05 14:34:45 -06:00
Belsima
0a76047cef
Loadout adjustments.
2017-12-02 08:59:46 -05:00
Neerti
01aaccf893
Finishes UFO PoI
2017-11-26 15:10:25 -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
