cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,876 Commits 5 Branches 0 Tags
fd46ebb51aeba66abfe44b0477ccd2ce751bce0f
Commit Graph

1921 Commits

Author SHA1 Message Date
Atermonera
1c7dd9631c Merge pull request #6744 from listerla/pda-holo 
Adds holoPDA from Aurora
 2020-02-26 21:04:50 -05:00
Atermonera
fbe42c39ef Merge pull request #6733 from VOREStation/pol-aitweaks 
Readd some AI features and improve AI buildmode
 2020-02-26 20:16:06 -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
ShadowLarkens
22c85075f4 Ported tg asset cache 2020-02-19 19:55:01 -05:00
Arokha Sieyes
d5b820fc58 VChat: Redone chat output in Vue.js 
Co-authored-by: Leshana <Leshana@users.noreply.github.com>
 2020-02-19 19:55:01 -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
Killian
92e988d3c4 edit comments 2020-02-16 06:34:09 +00:00
Killian
76f4ffe0de traffic! 2020-02-16 05:28:11 +00:00
Razgriz
00495d3772 Merge pull request #224 from CHOMPStation2/Razgriz1032-patch-24 
New uniform, rolled states, fixed star trek uniforms
 2020-02-15 17:28:34 -07:00
Cebutris
a3a22796ae hot hot egg 2020-02-14 17:11:10 -05:00
Arokha Sieyes
74c6f7c1e7 Rename "Aronai Kadigan" -> "Aronai Sieyes" 2020-02-14 11:06:04 -05:00
Erik
11268a3ff4 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge 2020-02-13 20:36:32 -08:00
Aronai Sieyes
641ed43b23 This one should be WRITE_LOG 2020-02-13 12:21:03 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Razgriz
1a75422858 New uniform and fixes star trek uniforms 
Adds a green-colored flight suit with security uniform armor values for security.
Separates star trek engineering uniforms and security uniforms.
 2020-02-12 03:31:35 -07:00
Kassc Zeravla
1c5b7c7390 Modified "control_freak" to full access. 
Players and Admins now have access to the full list of "client side options". So that means they can use; Command, Macros, Gamepad Mapping, Gamepad setup, Edit Skin & Preference.
 2020-02-07 19:39:31 -06:00
Killian
7d0bed5e4f add new clothes 2020-02-05 21:50:32 +00:00
Nadyr
a0751cbf0b Merge pull request #204 from Kazzc/MacroFix 
Macro fix for Players and Admins
 2020-02-03 21:13:59 -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
Kassc Zeravla
99266915d5 Enable Macros for Admins and Players 
Enabled macros and costume skins for players and admins and removed some redundant client side options.
 2020-02-03 19:17:44 -06:00
Kassc Zeravla
8f9a1a9ed6 Revert "Revert "Revert "Revert "Merge remote-tracking branch 'Kazzc/MacroFix' into MacroFix"""" 
This reverts commit de03660da4.
 2020-02-03 18:56:32 -06:00
Kassc Zeravla
de03660da4 Revert "Revert "Revert "Merge remote-tracking branch 'Kazzc/MacroFix' into MacroFix""" 
This reverts commit cdef2beb3d.
 2020-02-03 18:50:11 -06:00
Kassc Zeravla
cdef2beb3d Revert "Revert "Merge remote-tracking branch 'Kazzc/MacroFix' into MacroFix"" 
This reverts commit 8a22bd7385.
 2020-02-03 18:49:54 -06:00
Kassc Zeravla
8a22bd7385 Revert "Merge remote-tracking branch 'Kazzc/MacroFix' into MacroFix" 
This reverts commit f36ba2a9c1.
 2020-02-03 18:49:41 -06:00
Kassc Zeravla
f36ba2a9c1 Merge remote-tracking branch 'Kazzc/MacroFix' into MacroFix 2020-02-03 18:35:31 -06:00
Kassc Zeravla
6d53b51ed4 Macro fix for Players and Admins 
changed control_freak on both files, allowing admins to use Macros and removing redundant client side options
 2020-02-03 18:31:38 -06:00
Shadow
ca7fd68c99 Fluffi Item 2020-02-02 15:16:31 -06:00
Darlantan
1ff6996898 Reimplements hooded tesh cloaks 
Re-adds hooded teshari cloaks, also re-adds the retrowave and glowing teshari cloaks. Renames "teshari_hood.dmi" to "teshari_hood_ch.dmi" because this file doesn't exist upstream.
 2020-01-31 22:11:25 -05:00
Arokha Sieyes
2b01382eed Needs to return true 2020-01-31 15:11:33 -05:00