Commit Graph

154 Commits

Author SHA1 Message Date
Unknown
b237af9eab Rebalances VR Jumpsuits
Virgo-specific jumpsuits (KHI and Star Trek) available in loadout are not supposed to have protection bonuses over the non-virgo ones.
2018-10-08 17:41:07 -04:00
Arokha Sieyes
b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
2018-09-27 18:01:09 -04:00
Aronai Sieyes
088b4d27af Merge pull request #3859 from Mewchild/MC-Fluff
Vietsi Fluff Items
2018-06-15 09:00:26 -04:00
Mewchild
7960499bd2 Vietsi Fluff Items 2018-06-11 12:00:27 -05:00
Nepoox
8ff967eeec Changed name and description 2018-06-09 23:19:57 +02:00
Nepoox
e1cbfac2bf Fluff Item 2018-06-09 02:50:41 +02:00
Arokha Sieyes
c4cbe31199 Removes taur suits 2018-05-04 22:16:17 -04:00
Mewchild
b08357a068 Got dang quotation mark 2018-04-15 17:22:21 -05:00
Mewchild
8b469c4ec7 Adds Zigfe's Fluff Item 2018-04-15 17:11:08 -05:00
Cameron653
1b447796de Moves to proper file 2018-04-08 21:05:47 -04:00
Cameron653
c026f42676 Adds SilencedMP5A5's fluff items
https://forum.vore-station.net/viewtopic.php?f=27&t=1302
2018-04-08 01:03:07 -04:00
Verkister
dd454644d1 Fixed leg wraps
When no species are in the existing allowed list, no species can wear the thing.
2018-03-20 15:10:42 +02:00
Arokha Sieyes
de9cd436f7 Fixes #3285 - Gilded cuffs not shown on mob 2018-03-18 15:17:22 -04: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
killer653
641348c744 BeyondMyLife's custom fluff items 2018-02-23 15:10:35 -05:00
Aztectornado
105f986db1 Adds Siren jumpsuit 2018-02-22 06:00:41 -06:00
Leshana
f34a0f104e Revert adding unnecessary proc and fixing paths for vietsi custom item. 2018-02-18 00:47:10 -05:00
Mewchild
6af91caf6b Ringfix v2 2018-02-17 23:02:41 -06:00
Mewchild
cb01bd8db5 Ringfix 2018-02-15 00:46:57 -06:00
Mewchild
bdb99ce7dc Updates Fluff ring so gloves can be worn over it, and so it functions as a stamp (similar to normal signet ring) 2018-02-13 17:13:25 -06:00
KotetsuRedwood
d1816a3eca Adds Latex Maid Dresses.
As the title says! Also renames clothes stuff because SS13 needs jumpsuits to end with _s for some inscrutible reason
2018-01-29 19:47:14 +00:00
Arokha Sieyes
8dae4a6f04 Merge pull request #2725 from VOREStation/aro-bacon
Refactor Digestion
2018-01-14 00:07:54 -05:00
Isaac Erwin
890663f2e0 Renames leg cuffs to leg wraps, renames the gold ones
Mainly to fix the inconsistent capitalization, partially to make it consistent with the names in the loadout, partially because I think they're too long to be considered a cuff.

I'd also change the pathing so that the cuffs aren't a subtype of black shoes for no apparent reason, but I'd rather not accidentally break anything.

I'm also going to take this opportunity to say that I want an all-black/grey variant of these.
2018-01-11 07:36:37 -05:00
Arokha Sieyes
072a40dea3 Make digest_act even more generic (and contaminate)
Now returns nutrition that should be gained, and accepts an internal_contents list and where you want subobjects placed
2018-01-10 10:02:13 -05:00
Arokha Sieyes
449dcbb0b7 Refactor Digestion 2018-01-10 02:06:13 -05:00
Mewchild
a3d9ea5659 Bone Signet Ring 2018-01-06 16:51:06 -06:00
Cyantime
d64dc8cf6a Cleans up custom_clothes_vr.dm 2017-12-20 22:23:29 -05:00
Verkister
dcdeba60ae adds gn set 2017-11-22 23:53:59 +02:00
Cameron653
bd8d2bbf00 Gives Tas coat same allowed items as HoS oat 2017-11-20 16:04:59 -05:00
killer653
315711b314 Pol sync part 2 2017-10-27 15:30:51 -04:00
saysage
934288aa9e Update custom_clothes_vr.dm 2017-10-16 16:02:35 +03:00
saysage
7a2386dac0 Update custom_clothes_vr.dm 2017-10-14 21:30:57 +03:00
Natje0
c634235064 Costum_clothes code for Awens clothes. 2017-10-12 03:37:52 +02:00
Cameron653
c46c397280 Fixes Beyondmylife's coat 2017-09-29 20:52:08 -04:00
killer653
8e0f08d43b Forgot this 2017-09-26 18:18:33 -04:00
killer653
833fe7a75f BeyondMyLife: Ne'tra Ky'ram fluff
https://forum.vore-station.net/viewtopic.php?f=26&t=1117&sid=1451fde8eebda775f37a397f5cd50e79

https://forum.vore-station.net/viewtopic.php?f=26&t=1116&sid=1451fde8eebda775f37a397f5cd50e79

https://forum.vore-station.net/viewtopic.php?f=26&t=1115&sid=1451fde8eebda775f37a397f5cd50e79
2017-09-26 18:14:40 -04:00
Cameron653
abb4a58ee1 Update custom_clothes_vr.dm 2017-09-24 13:45:04 -04:00
killer653
47afd1502d Adds a loincloth to the xeno loadout 2017-09-11 21:18:29 -04:00
Verkister
3bd672954d Tough boy fluff stuff (Opie goggles + 2 special offer general loadout items)
-Adds the approved fluff goggles https://forum.vore-station.net/viewtopic.php?f=26&t=1073
-Also adds general use metal necklace thingy and a colorable headband for loadout selection.
2017-09-06 15:55:16 +03:00
Spades
a55d4c5e4c Imperial Military Update
Adds Imperial stuff for our space elf romans.
2017-09-02 04:07:25 -04:00
killer653
e2ea7951d3 Teshari stuff was added to Polaris. 2017-08-28 21:22:05 -04:00
killer653
153641cabe Fixes conflict
Fixes conflict
2017-07-25 08:58:36 -04:00
Cameron653
a5d54f1bac Removes whitespace. 2017-07-23 19:11:56 -04:00
killer653
3a5da61430 Adds Roiz's custom coat 2017-07-23 16:23:32 -04:00
Cameron653
a516a0d041 Adds L and R hand sprites 2017-07-23 10:47:26 -04:00
killer653
016337ee4d Quick, small fix. 2017-07-21 04:02:49 -04:00
killer653
8fbf7fc176 Adds Natje's fluff items 2017-07-21 03:02:52 -04:00
Spades
a04bca6da9 Merge pull request #1863 from Ketrai/patch-1
Add approved fluff item: pink bear hat.
2017-07-19 12:26:48 -04:00
Ketrai
55402f1c73 Update custom_clothes_vr.dm 2017-07-18 20:53:51 +02:00
Ketrai
ac9440956b Add approved fluff item: pink bear hat.
link to approved form : https://forum.vore-station.net/viewtopic.php?f=26&t=956

First time I'm adding fluff, no idea if this is how I'm supposed to do it, just tried to follow the instructions.
2017-07-15 19:43:40 +02:00