cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,876 Commits 8 Branches 0 Tags
fd46ebb51aeba66abfe44b0477ccd2ce751bce0f
Commit Graph

1186 Commits

Author SHA1 Message Date
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
Aronai Sieyes
9bbfd211a3 Vorestation edit fixes 2020-03-15 15:17:27 -04:00
Novacat
176cf4f5ca Merge pull request #6874 from VOREStation/upstream-merge-6804 
[MIRROR] Big Bastard Incidental Sound Port
 2020-03-15 15:14:39 -04:00
Novacat
557ed2e43e Update occupation.dm 2020-03-15 14:40:44 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Atermonera
3ac5a32e39 Fixes the occupation screen. 2020-03-15 14:35:59 -04:00
Razgriz
9b922161e6 egg 2020-03-13 00:43:29 -07:00
Atermonera
cb8548f5af Fully Implements R_EVENT for Event Managers 2020-03-12 15:01:50 -04: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
Atermonera
fa8c9fabab Job description alt 2020-03-11 15:55:05 -04:00
SplinterGP
55a8639c67 Fix to other species being able to wingdings 2020-03-06 14:45:53 -03:00
SplinterGP
7e20d0a63f Fixes a <b> that should not be there 2020-03-05 23:14:03 -03:00
SplinterGP
bc690976cd Adds YW comments 2020-03-05 22:55:28 -03:00
SplinterGP
7c493f73f6 Adds grey speech problem 
adds a speech problem that causes grey speak to be completely messed.
 2020-03-05 22:24:22 -03: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
Neerti
0d9345adde Half-Refactors Jobs 2020-03-03 16:28:33 -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
Atermonera
1c7dd9631c Merge pull request #6744 from listerla/pda-holo 
Adds holoPDA from Aurora
 2020-02-26 21:04:50 -05:00
Novacat
7821dcd2bc Merge pull request #6603 from Meghan-Rossi/fluffstuff 
Fluff item
 2020-02-25 10:48:57 -05:00
Novacat
4298fd39eb Merge pull request #6619 from VOREStation/fix-seeds-runtime 
Fix Sundry Runtime Errors
 2020-02-25 10:42:09 -05:00
Atermonera
89a32f867f Merge pull request #6723 from Heroman3003/placementpref 
Creates a preference for precise item placement
 2020-02-24 16:10:22 -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