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
55,155 Commits 5 Branches 0 Tags
ef1acd0452e6e65720e9d62cca3df8813fa0ef24
Commit Graph

1019 Commits

Author SHA1 Message Date
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07:00
SplinterGP
17df0f666f Merge branch 'master' into master 2020-05-05 21:02:46 -03:00
SplinterGP
6b1cb4e1ff Adds haemophilia too and reset button 2020-05-05 20:53:41 -03:00
SplinterGP
3ad4e4a535 Disabilities out of trait system 2020-05-05 15:46:30 -03:00
Killian
8240a97400 Merge branch 'master' into kk-miscstuff 2020-05-04 14:20:02 +01:00
SplinterGP
d014595b73 Merge remote-tracking branch 'Yawn-wider/master' into holdelta 2020-04-30 21:49:16 -03:00
SplinterGP
a100713305 Puts some extra on name so sec officers can know it is job-related 2020-04-30 21:27:16 -03:00
SplinterGP
0b5c897eb8 adds YW edit 2020-04-30 20:24:42 -03:00
Killian
c0a8fc67db small loadout tweaks 2020-04-28 07:00:31 +01:00
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
Aronai Sieyes
9368dd2736 Talon job pref saving 2020-04-13 11:05:27 -04:00
MrSign
0da3c94d09 Update loadout_fluffitems_vr.dm 2020-04-13 13:14:19 +10:00
Atermonera
83c1a512e2 Adds pref to toggle vchat without 60s wait for linux users (#6980) 2020-04-12 00:51:57 -04: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
Aronai Sieyes
ef32afa133 Merge pull request #7083 from VOREStation/vplk-pointdefense 
Port Point Defense Batteries
 2020-04-02 10:53:29 -04:00
Aronai Sieyes
bedcdd8d0c Merge pull request #7082 from Heroman3003/colorwraps 
Makes cloth footwraps colorable in loadout
 2020-04-02 10:52:58 -04:00
Leshana
23482e88fa Moves topic return value defines to where they are usable everywhere. 2020-04-01 20:36:00 -04:00
Heroman
91291fb6b2 Makes cloth footwraps colorable in loadout 2020-04-02 09:34:31 +10:00
Aronai Sieyes
301b5eb467 Allow wings with a secondary color 
Adds code to support wings with extra_overlay having a secondary color, like tails do. Currently extra_overlay is just ignored on wings.
 2020-03-31 22:40:48 -04:00
Repede
73ec83c76f Merge branch 'master' into kk-miscstuff 2020-03-28 00:15:57 -04:00
Repede
515c9ac9d7 Merge branch 'master' into TFF-Mute_Thy_Merpage 2020-03-27 22:13:11 -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
TheFurryFeline
425fe022d5 [Earlyport] Mutable Emotes 
Ports https://github.com/VOREStation/VOREStation/pull/7005 early. Also restores some code that got removed: Skrell warbling, but leaving it commented out until I get some feedback on it.

Changelog Notes:

- Allows muting of any audible emotes such as merps, squishes, and so on.
 2020-03-26 14:40:22 -04:00
TheFurryFeline
bafc26e80f [Earlyport] Mutable Emotes 
Ports https://github.com/VOREStation/VOREStation/pull/7005 early.

Changelog Notes:

- Allows muting of any audible emotes such as merps, squishes, and so on.
 2020-03-26 14:39:11 -04:00
Aronai Sieyes
556ef6acc8 Emote noise toggle 2020-03-26 11:43: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
Unknown
ac2e5b8d03 Fixes Occupation Screen 2020-03-17 15:28:40 -04: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
Novacat
194c9f7a63 Merge pull request #6841 from VOREStation/upstream-merge-6818 
[MIRROR] Fully Implements R_EVENT for Event Managers
 2020-03-15 17:01:36 -04:00