cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,149 Commits 5 Branches 0 Tags
f7e9f8d12bddd3183ee87a4e02ff9c5935b51a5c
Commit Graph

1129 Commits

Author SHA1 Message Date
Killian
35dedb85e8 Merge branch 'master' into kk-miscstuff 2020-04-17 19:56:51 +01:00
Repede
e44e346352 Release Update 
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
 2020-04-16 21:07:33 -04:00
Novacat
13353294f2 Merge pull request #7239 from Heroman3003/headband-maid 
Adds maid headband to loadout
 2020-04-13 18:04:29 -04:00
Heroman
fa5422cc63 Adds a comment for future 2020-04-14 07:27:44 +10:00
Heroman
87a65a09c6 Fixes Azura's collar 2020-04-14 07:16:31 +10:00
Heroman
2073af57f1 Adds maid headband to loadout 2020-04-14 06:48:18 +10:00
MrSign
0da3c94d09 Update loadout_fluffitems_vr.dm 2020-04-13 13:14:19 +10:00
CRTXBacon
c78ffd954e Add files via upload 2020-04-12 02:04:18 +01:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Repede
517d74928b Merge branch 'master' into kk-miscstuff 2020-04-10 16:59:07 -04:00
MrSign
03005ad3d8 Update loadout_fluffitems_vr.dm 2020-04-08 14:33:30 +10:00
MrSign
2ab6a85f22 Update loadout_fluffitems_vr.dm 2020-04-08 12:21:32 +10:00
Unknown
0a58e60c87 Adds Everyone Else 2020-04-05 00:53:10 -04:00
Unknown
6c01ab5b8f Adds Ascian's Medals 
- Adds a Medal of Unity with two bronze stars for Ascian. Has its own sprite.
- Adds Ascian's Medal of Valor to loadout
- Refactors collars to be part of tie_vr in expected places.
 2020-04-05 00:41:05 -04:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
Heroman
1ae1900cd3 Fixes a random v 2020-04-03 10:13:23 +10:00
Heroman
7e3019971d Fixes identetions 2020-04-03 10:08:49 +10:00
Heroman
525bbb5650 Gives slots to most fluff items 2020-04-03 09:01:39 +10:00
Heroman
91291fb6b2 Makes cloth footwraps colorable in loadout 2020-04-02 09:34:31 +10:00
Repede
73ec83c76f Merge branch 'master' into kk-miscstuff 2020-03-28 00:15:57 -04:00
SplinterGP
9dd21ddbae Aroozee valhollide ring 
Fluff item
 2020-03-27 20:27:43 -03:00
TheFurryFeline
94ddb5eb13 Vakashi's Permit Expiration 
Expired permit removal, code cleanup.

Changlog Notes:

- Removes Vakashi's Permit and allowed item.

- Also removes code for Ace's long expired permit and the same for the commented out items.
 2020-03-26 20:50:26 -04:00
Atermonera
027028b314 Repaths collapsible white canes to not anger beepsky 2020-03-25 16:39:18 -04:00
Razgriz
3a3759f2f1 Update loadout_fluffitems_ch.dm 2020-03-23 15:37:37 -07:00
Razgriz
6fd126a7e9 Update loadout_fluffitems_ch.dm 2020-03-23 15:21:41 -07:00
EllyBrown
b6d893db49 Changes to the custom item. (#6929) 
* Add files via upload

* Update custom_clothes_vr.dm

* Update loadout_fluffitems_vr.dm

* Update custom_clothes_vr.dm

* Update custom_clothes_vr.dm

* Update loadout_fluffitems_vr.dm

* Update loadout_fluffitems_vr.dm

* Update custom_clothes_vr.dm

* Update custom_clothes_vr.dm
 2020-03-21 00:55:55 -04:00
Razgriz
7ae8129731 Nullsuits 2020-03-20 20:31:17 -07:00
Killian
8d2ec5f7fa loadout comments, improved warden/hos access modification 2020-03-17 15:44:23 +00:00
Killian
8b9f5e949a security pilot basics 2020-03-17 15:11:28 +00:00
Razgriz
9b922161e6 egg 2020-03-13 00:43:29 -07:00
Meghan-Rossi
f7eabadf22 fluff items 
*Adds Medal of Valor for Brynhild Vandradottir - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1688
*Adds Medal of Valor for Lilith Vespers - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1690
*Adds Vox scrap armor for Yikatihaki - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1662
*Adds silver pocket watch for Cappy Fuzzlyfeathers - approve in https://forum.vore-station.net/viewtopic.php?f=27&t=1651
*Adds green sweater vest for Zaku Fyodorovna - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1674
 2020-03-12 17:42:19 +00:00
Repede
6e293183ad Merge branch 'release' of https://github.com/VOREStation/VOREStation into releaseupdate 
# Conflicts:
#	icons/mob/hud.dmi
 2020-03-04 08:17:38 -05:00
Atermonera
882aeee371 Merge pull request #6772 from Heroman3003/teshfix 
Fixes a teshari mining undercoat
 2020-03-03 01:38:13 -05:00
Repede
03af76bd29 Merge branch 'master' into releaseupdate 2020-03-02 19:40:13 -05:00
SplinterGP
51b67068ff Fixes oof on commit, path was missing 2020-03-02 21:00:48 -03:00
SplinterGP
42c3d5305f Adds uniforms to loadout, forgot on last commit 2020-03-02 20:31:48 -03:00
SplinterGP
c65432d1c9 Adds fancy victorian vests, dresses and coats. 2020-03-02 20:27:39 -03:00
Hawk_v3
f2b8f92b63 Merge remote-tracking branch 'upstream/master' into releaseupdate 2020-03-02 17:55:11 +00:00
Wickedtemp
40e2518633 Update loadout_fluffitems_vr.dm 2020-03-01 21:48:12 -06:00
Repede
c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
 2020-03-01 12:35:52 -05:00
Novacat
1602627443 Merge pull request #6643 from VOREStation/aro-detect 
Add alternative detective wear
 2020-03-01 10:54:03 -05:00
Heroman
b45f37b7c8 Adds Pip's Cloak 2020-03-01 12:32:31 +10:00
Shadow
b316782762 The implantening 2020-02-28 18:42:49 -06:00
Novacat
7821dcd2bc Merge pull request #6603 from Meghan-Rossi/fluffstuff 
Fluff item
 2020-02-25 10:48:57 -05:00
Leshana
a5af2759e3 Fix Runtime in loadout.dm,277: bad index 
Runtime happens when someone has a saved preferences loadout containing an item that currently is expected to have gear_tweaks, but at the time that the savefile was last saved, did *not* have gear tweaks.  Thus the saved prefs have null metadata.
Also it makes no sense to check the length of a list *inside* a for loop iterating over that list..
TODO - Figure out if its okay to spawn it without the metadata.
 2020-02-23 22:03:21 -05:00
Luke Vale
f09c5dd6ed Updates the Collar for the name change and some lore updates. 2020-02-23 20:57:21 +00:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Repede
7fc70caa43 Resetting master 2020-02-22 12:28:01 -05:00
Aronai Sieyes
2a53830fa7 Add alternative detective wear 2020-02-21 13:46:49 -05:00
TheFurryFeline
fadaf32cbb Better Double Check 
Taaa's got 3 medals, so making sure they will all show up as different names.
 2020-02-20 23:20:55 -05:00