cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 6 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

179 Commits

Author SHA1 Message Date
Meghan-Rossi
dfc42293c7 Fluff items and species whitelisting 
*Adds AmareWolf to Xenochimera whitelist - approved in https://forum.vore-station.net/viewtopic.php?f=46&t=1655
*Adds medal of unity for Roy Tilton - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1629
*Adds balaclava for Monty Kopic - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1628
*Adds warning collar for Excess - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1593
*Deletes obsolete/unused file "custom_items.txt"
 2020-02-18 00:27:36 +00:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Unknown
64b4d435f9 Joan's spacesuit no longer NORMAL size 2019-12-29 11:26:37 -05:00
Novacat
309a7af8fc Merge pull request #6289 from EllyBrown/master 
Changes to my fluff clothing "Star Sweater" (#2)
 2019-12-10 20:58:50 -05:00
EllyBrown
ea99d275e3 Update custom_clothes_vr.dm 2019-12-11 00:59:00 +02:00
EllyBrown
237b50bf7f Add files via upload 2019-12-11 00:09:42 +02:00
Novacat
929ff8077c Merge pull request #6171 from EllyBrown/master 
Elly Brown (bacon12366) fluff item.
 2019-11-08 16:35:08 -05:00
EllyBrown
7d3ff451fb Add files via upload 2019-11-08 19:36:36 +02:00
Meghan-Rossi
6bee95ef01 Fluff items 
Removes Tasald's coat and loyalty implanter as requested in #6147
Adds Tasald's Cartographer's Uniform as approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1627
adds medals:
Xander Bevin - Conduct - https://forum.vore-station.net/viewtopic.php?f=27&t=1579
Nick Sloan - Conduct - https://forum.vore-station.net/viewtopic.php?f=27&t=1575
Erik Ramadwood - Unity - https://forum.vore-station.net/viewtopic.php?f=27&t=1624
Nolan Conaway - Unity - https://forum.vore-station.net/viewtopic.php?f=27&t=1622

Resolves #6147
 2019-11-05 11:28:37 +00:00
Verkister
855d795357 Some Protean fixes 
-Fixes protean regeneration not working at all.
-Fixes not being able to get metal as blob.
-Fixes unblobbing as custom size breaking vertical offset.
-Adds a general use loadout fluff vest planned for a prottie char.
-Fixes blobmob being slow due to mob update movement delays.
-Gives protties trasheat verb.
 2019-10-01 10:30:29 +03:00
Heroman
341520e766 Makes Melanie's skeleton indigestible 2019-09-29 18:49:45 +10:00
Heroman
f6f2acca6f Adds Melanie's Skeleton 2019-09-29 14:28:56 +10:00
Cyantime
eac30eb7e1 Gives Burrito their uniform back 2019-09-01 19:18:14 -04:00
Unknown
20d87447a9 Removes HoS Voidsuit Stats 2019-08-28 01:24:48 -04:00
chaoko99
151043ad85 Fixes Chaoko99's custom item. 2019-08-13 19:06:29 -07:00
chaoko99
ca099753a4 adds chaoko99's custom item 2019-07-25 20:59:44 -07:00
Heroman
dea577a951 Updates fluff item lists 2019-06-09 15:40:38 +10:00
Heroman3003
e3e715454b Makes placeholder entries for lore writing 2019-04-23 11:13:42 +10:00
Unknown
4420f0cb81 Fixes Resh's Navy blue HoS Jacket 2019-04-06 13:36:39 -04:00
TheFurryFeline
02ef9c29ed Typo fix 2019-03-01 15:05:47 -05:00
TheFurryFeline
e167b25f4c Add Resh's HOS Coat 
So, I saw a thing on forums here, https://forum.vore-station.net/viewtopic.php?f=26&t=1519 and thought, 'hey, I can fix that.' So, here we are. :> Also adjusts Phi's last name - in the comment for the listing - as I've seen it in-game, back to Viesti.
 2019-03-01 14:00:58 -05:00
Mewchild
7477c696dc Updates Fluff Item 2018-12-14 13:21:49 -06:00
Screemonster
10138a49d3 makes the pompom uncontaminatable 2018-12-10 02:49:38 +00:00
Arokha Sieyes
d50e2d9deb Edit mapped in HoS armor 
It was edited on the map to have pretty incredible armor values, better than SWAT armor, even. Things like this shouldn't be edited in the dmm files. Hard to have oversight on things like that.
Moved the armor values to the code and out of the map, and adjusted them to be more reasonable after discussing with other admins.
 2018-11-04 22:51:32 -05:00
Heroman3003
1ea42e4558 Refactors Awoos into Wolfgirls 2018-10-20 12:35:32 +10:00
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