cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-07 07:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,691 Commits 7 Branches 0 Tags
8d2ec5f7fa62b83cb2eabf2283ffc3072e3efb21
Commit Graph

1791 Commits

Author SHA1 Message Date
Shadow-Quill
68ca0231b7 Fixes everyone having the verb 
Untested
 2020-03-06 18:13:05 -06:00
Hawk_v3
f2b8f92b63 Merge remote-tracking branch 'upstream/master' into releaseupdate 2020-03-02 17:55:11 +00:00
Heroman
0586676320 Fixes Pip's ears 2020-03-02 12:58:52 +10: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
df83acadfc Adds Pip's Ears 2020-03-01 12:46:52 +10: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
Novacat
7821dcd2bc Merge pull request #6603 from Meghan-Rossi/fluffstuff 
Fluff item
 2020-02-25 10:48:57 -05:00
Leshana
25fed81d9f Fixed Runtime in simple_animal_vr.dm,41: Cannot read null.digest_mode 
- Caused by using "Toggle Animal's Digestion" verb on non-vore-capable mobs.
- Even better, changed it to not even add those verbs on mobs without vore
- Also remove the path from VV addverb since it is a proc now.
 2020-02-24 17:57:56 -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
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
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
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman
d841259cf3 Adds logging to the breaking of devourable/feeding prefs 2020-02-10 13:43:35 +10:00
Heroman
8e26511aa1 Prevents some teleporting abuses with taur riding 2020-02-08 07:45:53 +10:00
Izac Joof Forsgren
8fadaaa6bb Merge branch 'master' into Blinkyfuckingplonkygetthefuckoffmyproperty 2020-02-07 20:56:37 +01:00
Luke Vale
c1d9f70f58 Adds ears_yw.dmi and adds a new set of horns for the ears. Massive horns. 2020-02-07 13:09:51 -06:00
lukevale
03edbd2fc3 Update sprite_accessories_taur_yw.dm 2020-02-07 10:41:03 -06:00
Luke Vale
4767a51cce Adds taails 2020-02-07 10:15:24 -06:00
SplinterGP
2d335cd43a Fixes Yawn wider taur sprite not showing 
Adds the YW taur sprites correct icon path as they used the taur_vr instead of taur_yw that is the correct one
 2020-02-06 23:23:29 -03:00
Leshana
b7da221856 Fixes Runtime in living_vr.dm,428: Cannot read null.name 
This was happening when null is passed for belly. Now it will print *null*
Also fixed root cause (at least one of them).
Animals can't have vore attributes enabled when vore_active = 0 because
then they don't get a belly.
 2020-02-04 16:33:22 -05: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
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Novacat
022c7edaae Merge pull request #6405 from Mithrandalf/mouse3 
more mouse stuff, bugfix
 2020-01-09 22:51:47 -05:00
Novacat
afb879ae23 Merge pull request #6379 from Heroman3003/resleeving_sickness 
Adds resleeving sickness
 2020-01-09 22:50:42 -05:00
Novacat
9b2ff8f8f7 Merge pull request #6312 from TheFurryFeline/TFF-No_Absorbee,_No_Absorbee,_Noooo_Absorbee 
Absorption Permission Stuff
 2020-01-09 22:50:18 -05:00
Heroman3003
5f05d26eb9 Merge branch 'master' into resleeving_sickness 2020-01-10 09:43:42 +10:00
Mithrandalf
1e8a54b736 mouse 2020-01-08 15:32:07 +00:00
Heroman
2b10027024 Makes the sickness affect only people dying via non-vore deaths, adds fluff version with no downsides 2020-01-07 17:02:39 +10:00
Hawk_v3
838f5e9418 Merge remote-tracking branch 'upstream/master' 2020-01-06 00:47:53 +00:00
Novacat
76f323984c Merge pull request #6373 from Verkister/ridewild 
Adds a verb for rideable mobs to toggle rider control without a riding crop
 2020-01-01 12:03:42 -05:00
Hawk_v3
8a0b78c322 Merge remote-tracking branch 'upstream/master' 2020-01-01 15:16:53 +00:00
Novacat
524ef9ee17 Merge pull request #6349 from Novacat/nova-basicfixes 
Misc Changes and bugfixes
 2019-12-31 18:39:10 -05:00