4c5332a145
Redo to Fix Mistake With Icons
...
That was annoying with how that went.... Bad idea to overwrite the files with direct copy-pasta'ing from Polaris. Idea: Do it again but make a different name and copy the desired icon_state. Yay! It works!
2019-09-22 12:53:54 -04:00
1f3aa1dd27
Revert "Orange Is the New Orange!"
...
This reverts commit 686c3adf9b
2019-09-21 18:35:56 -04:00
686c3adf9b
Orange Is the New Orange!
...
Add a new version of the orange jumpsuit and refactors the prison one to be a different obj path. Prison and Orange jumpsuits are both selectable in the loadout via Jumpcloth Selection. New .dmi updates for the whole thing as well.
2019-09-21 18:04:11 -04:00
c2a4b6b63d
Adds in department specific cloaks and custom cloak
...
Ports over the department specific cloak and the colorable cloak to the game/loadout from Virgo.
2019-08-27 20:50:06 -04:00
9d73a43212
adds 10 "certified bellybrig" badges to secvend
2019-08-26 14:40:25 -07:00
dbacd5a2bf
Two cute bunny girl uniforms in black and white! You can all thank Skits for making these spontaneously for us to enjoy!
2019-07-22 12:01:42 +02:00
19ec474096
Merge pull request #709 from Razgriz1032/Razgriz1032-tactical-jumpsuit-roll
...
Tactical jumpsuit roll
2019-06-03 21:48:13 -07:00
7e72d9ac3c
Tactical jumpsuit can roll down or roll sleeves
2019-06-03 21:09:33 -07:00
57760acd09
Teshari Security Undercloak armor
...
Teshari Security Undercloak has 1:1 stats with security jumpsuits.
2019-05-26 12:52:07 -07:00
72eee4d639
Merge pull request #679 from Darlantanis/TeshariPonchoFix
...
Did you know teshari poncho sprites have been lurking in the code?
2019-05-21 06:57:21 -04:00
b8761b3b26
Fixes ponchos to properly use teshari-specific sprites when worn by teshari.
...
-Removes "icon override" line from ponchos
-Icon override is now set on equipping ponchos in the outer clothing slot using ties.dmi for non-teshari and seromi/suit.dmi for teshari
-Icon override is set back to null when unequipped. This prevents bugs with the poncho icons as "equipped" does not trigger when wearing a poncho as an accessory, thus making it possible to use the wrong sprites if icon override is not reset.
2019-05-21 05:31:27 -05:00
54bec876d9
Indigestible Collar
...
Adds indigestible collar to loadout, same look as holo-collar. Primarily for those who want to RP out something surviving them no matter what. :>
2019-04-23 20:41:15 -04: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
a67c7d91ef
Fixed broken paths.
...
-The mining cloak ported directly from Virgo was for a mining poncho for some reason
-Set the wrong .dmi for undercoats
2019-03-20 21:55:16 -05:00
36fabeb786
Missed some indents.
2019-03-20 21:44:56 -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
cc1cd0b3b2
ERT
2019-03-09 07:48:43 -08:00
7fd8148b21
Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation
2018-12-22 17:56:29 +00:00
fe0434f29a
Allow any collar to change tag
2018-12-22 17:54:18 +00:00
e6eafc8970
Merge branch 'master' into NIF-Test
2018-12-15 00:25:00 +00:00
f58e1997b2
SMB64's Necklace
...
adds a custom necklace for SMB64's Characters
2018-12-13 16:51:37 -08:00
473bc9c71a
Adding mass to the holo collar
...
Mass is a variable used by the Autolathe to determine cost.
2018-12-12 20:14:50 +01:00
15acf6d79d
Merge pull request #3780 from VOREStation/aro-exppermit
...
Corrects explorer permit language
2018-05-28 20:59:33 -04:00
310dcd4d0d
Grammar!
2018-05-28 19:26:56 -04:00
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
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
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
449a495b54
Merge pull request #5299 from Novacat/spriteadd
...
Accessory Fixes
2018-05-26 15:23:54 -07:00
d8f1069689
Adds a number of accessory related null checks
2018-05-25 12:29:33 -05:00
088eee3d96
SYNC: Compileability fixes
2018-05-25 13:29:30 -04:00
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
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
db739dfc34
Did not work as well
2018-05-22 13:30:37 -04:00
2c1ad0076f
Requested Fixes
2018-05-22 12:49:41 -04:00
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
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
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
94c9d631f9
Fixes custom accessories not showing up on things
...
Contradictory hardcoding babe.
2018-03-24 14:24:44 +02: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
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
2935ec1ac8
Merge pull request #3149 from VOREStation/aro-sync
...
Polaris Sync
2018-02-27 21:48:52 -05:00
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
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
f04c58f202
VS: Rewrites basically all of how bellies work
...
And cleans up a ton of stuff.
2018-02-27 13:29:45 -05:00
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
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
TheFurryFeline