cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,963 Commits 8 Branches 0 Tags
b32c83250cc23eef8f94d4bbfb87c2cf114af9a1
Commit Graph

796 Commits

Author SHA1 Message Date
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
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
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
Unknown
ac2e5b8d03 Fixes Occupation Screen 2020-03-17 15:28:40 -04: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
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
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
Wickedtemp
40e2518633 Update loadout_fluffitems_vr.dm 2020-03-01 21:48:12 -06: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
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
Aronai Sieyes
2a53830fa7 Add alternative detective wear 2020-02-21 13:46:49 -05:00
Greenjoe12345
3391de2f42 canes and crutches (#6694) 
* Edited white cane inventory/ground sprite, and changed in-hand sprites to ones from Yawn Wider
added a telescopic cane, ported from Yawn Wider (credit to gozulio)
ported the crutch item from world server
both new items were added to loadout

* Edited white cane inventory/ground sprite, and changed in-hand sprites to ones from Yawn Wider

added a telescopic cane, ported from Yawn Wider (credit to gozulio)
ported the crutch item from world server
both new items were added to loadout
also fixed config.txt fuckup

* fixed a spelling error
 2020-02-19 14:34:41 -05:00
Heroman3003
07a73c7f23 Lowers cost of ponchos and cloaks in loadout (#6705) 2020-02-19 01:24:51 -05:00
Meghan-Rossi
b9abe73b7c Fluff item 
*Adds custom latex clothing for Excess - Approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1593
 2020-02-18 23:39:15 +00:00
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
74c6f7c1e7 Rename "Aronai Kadigan" -> "Aronai Sieyes" 2020-02-14 11:06:04 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
1f227a9b55 Merge pull request #6664 from PrismaticGynoid/loadouttoys 
Adds some toys to the loadout
 2020-02-03 20:50:45 -05:00
Verkister
fa0a6d88a8 Fixes loadout index runtime spam (#6626) 
sanity checks saving the day once more.
 2020-01-16 02:56:04 -05:00
Atermonera
28a1d8669c Merge pull request #6614 from Shadow-Quill/Psyche-Turtleneck 
Psychiatrists can now properly get the medical turtleneck via loadout
 2020-01-15 23:09:19 -05:00
Kates
930215e3d7 Update loadout_suit_vr.dm 2020-01-11 17:07:29 +01:00
lbnesquik
a92437ce23 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Taur-clothes-fix 2020-01-11 07:49:03 +01:00
lbnesquik
af97208347 Poncho is now in the loadout as well, with a little pointer to notify people. 
Poncho is also compatible with drake taur,  wolf get janitaurial jumpsuit for the future.
 2020-01-11 07:48:36 +01:00
Heroman
a570cafa2a Adds taur cloak and dress to loadout 2020-01-11 11:33:58 +10:00
Atermonera
b6a81efb9a Merge pull request #6582 from Shadow-Quill/Material-Scanner-Access 
QM can now get optical meson scanners
 2019-12-22 01:59:32 -05:00
Schnayy
29e187bb83 Adds 10 new clothes + sprite fixes. (#6575) 2019-12-20 00:44:28 -05:00
Novacat
0432002af7 Merge pull request #6327 from VOREStation/upstream-merge-6558 
[MIRROR] Change various global species lists to GLOB versions, adds 2 more event subspecies.
 2019-12-19 15:46:59 -05:00
Meghan-Rossi
604fd1b74f Resolve conflicts, fix compile errors 2019-12-19 17:49:21 +00:00
Verkister
0c074e501a Fixes loadout webbings/pouches for explorers 
Fixes loadout webbing vests and drop pouches lacking explorer access despite clearly stating its presence on the display name.
 2019-12-19 15:41:03 +02:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
TheFurryFeline
4fd6dc9868 Fluff Item Fixy 
Fixes #5992
 2019-12-10 09:41:00 -05:00
Novacat
cbb5a4bdd4 Merge pull request #6246 from TheFurryFeline/patch-9 
Expired Permit Removal
 2019-11-29 22:23:40 -05:00
Novacat
defff15e24 Update loadout_fluffitems_vr.dm 2019-11-29 20:56:27 -05:00
Anewbe
1de75f06bf Merge pull request #6548 from Meghan-Rossi/paifix 
Fix pAI preferences not loading
 2019-11-29 19:49:03 -05:00
Unknown
47bc5e411e Invisible Breath Masks 2019-11-28 19:33:46 -05:00
TheFurryFeline
5956dd62d8 Requested Changes 
Includes commenting out gun that had a permit for it.
 2019-11-28 11:06:56 -05:00