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
79,499 Commits 8 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

1073 Commits

Author SHA1 Message Date
Killian
01498d023e modkit forensics and new checks 2020-04-02 01:52:08 +01:00
Killian
b9804bb8e7 update moca's kit key 
Co-Authored-By: Izac Joof Forsgren <izac10@live.com>
 2020-04-01 22:30:47 +01:00
Killian
7732f38d2c conversion kit sanity checks 2020-04-01 13:44:57 +01:00
Killian
97cd4f349f conversion kit rejigger 2020-04-01 05:36:39 +01: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
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
b5ebde0b3b Nullsuits 2020-03-20 20:32:08 -07:00
Razgriz
2e4495dfd5 Update custom_boxes_ch.dm 2020-03-18 15:54:29 -07:00
Razgriz
bb167d1b86 Add files via upload 2020-03-15 23:39:00 -07: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
Shadow-Quill
68ca0231b7 Fixes everyone having the verb 
Untested
 2020-03-06 18:13:05 -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
Shadow-Quill
406855ce90 Merge branch 'master' into Coda-Fluff-Implant 2020-02-29 20:53:42 -06:00
Shadow
010821fb7c Fixes Size-Switching 2020-02-29 20:53:13 -06:00
Heroman
b45f37b7c8 Adds Pip's Cloak 2020-03-01 12:32:31 +10:00
Aronai Sieyes
39d0a8490f Fix madness 2020-02-29 20:00:16 -05:00
Repede
988c8cb57d Merge branch 'master' into teshcollars 2020-02-29 08:48:31 -05:00
Repede
c5db404f04 Fixes the basic collars to work on teshari using the poncho abuse system, totally ready to break them fluff collars. 2020-02-28 22:48:07 -05:00
Shadow
b316782762 The implantening 2020-02-28 18:42:49 -06: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
Meghan-Rossi
f0ed7d1f8b Switch to combined sprite for Excess's custom uniform 2020-02-20 09:38:53 +00: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
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
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
Razgriz
1fc6a40fff Comments 2020-02-15 00:28:01 -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
Razgriz
200656ac9a Nerf armorvalues on fedcoats 2020-02-14 00:49:38 -07:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Razgriz
fdf7fba1af Add flight suit for security & fixes trek uniforms 
Adds a few rolled down suit states from old chomp code. Some of these sprites might not be necessary, but they won't hurt to have.
But it does add a rolled down and rolled sleeves sprite of tactical jumpsuit.
Unfortunately rolled states cannot be easily separated into _ch files.
 2020-02-12 03:33:25 -07:00
Heroman
8e26511aa1 Prevents some teleporting abuses with taur riding 2020-02-08 07:45:53 +10:00
Shadow
ca7fd68c99 Fluffi Item 2020-02-02 15:16:31 -06:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update 
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
 2020-01-31 18:23:50 +01:00
Cebutris
3450336020 does the thing, and another thing 2020-01-20 13:44:02 -05:00
Heroman
43065cb062 Changes harpoons push mode to teleport user and not everything else (pull mode unchanged) 2020-01-14 11:12:10 +10:00
Cebutris
95a86ad1c4 foxicide fluff items 2020-01-13 19:27:33 -05:00
Hawk_v3
8a0b78c322 Merge remote-tracking branch 'upstream/master' 2020-01-01 15:16:53 +00:00
Unknown
64b4d435f9 Joan's spacesuit no longer NORMAL size 2019-12-29 11:26:37 -05:00
Repede
ecb31d04e0 Merge branch 'master' into master 2019-12-22 11:51:38 -05:00
Repede
b41698c720 Merge branch 'master' into master 2019-12-21 21:35:09 -05:00
Repede
a140d91d93 Merge branch 'master' into plaguefix 2019-12-21 21:34:42 -05:00
Repede
5f39877328 Fixes plague doctor mask 2019-12-21 17:33:33 -05:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
RadiantFlash7
af25a14c06 Map fixes 
Map fixes and fixing my fluff item's sprite. It failed a merge forever back.
 2019-12-21 00:10:44 -05:00