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

1019 Commits

Author SHA1 Message Date
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
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
Killian
d7f156ac13 fashion attack 2: jackets 2020-02-19 22:45:01 +00:00
TheFurryFeline
e7c710cac5 The Hype of Medals Fixed 
Medals are fixed now. If you have a medal on the list here, you'll be able to select it in the loadout. I've also taken the liberty to just nix the medals subtype for now. Unneeded spaghetti. Blep.

Changelog notes:

- Fixes modals not being selectable in loadout even with your name and ckey being correct.
 2020-02-19 17:00:06 -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
Repede
1950b800d0 Rin Deimos fluff item, just a crystal that does nothing. 2020-02-18 19:33:17 -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
Killian
891761e96a quickfix 2020-02-17 21:49:36 +00:00
Killian
72acdd2dac Merge branch 'master' into kk-traffic 2020-02-17 17:35:47 +00:00
Izac Joof Forsgren
d2010f54c5 Merge branch 'master' into kk-miscstuff 2020-02-17 17:44:09 +01:00
Repede
130ef71bac Merge branch 'master' into promwaterchemreagentreadd 2020-02-17 08:24:30 -05:00
SplinterGP
aa4f6a2e94 Adds aroozee fluff item 2020-02-16 22:35:41 -03:00
Killian
d39ed8d0f2 glasses! 2020-02-17 00:29:44 +00:00
Killian
77268ada27 Merge branch 'master' into kk-traffic 2020-02-16 07:00:56 +00:00