cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +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
Verkister
03ab2fef08 Updates sickshot description. 
Also making it little more clear that the only way to get victims out of uncooperative or dead things is no longer live human exclusive.
 2018-04-16 10:48:25 +03:00
Mewchild
b08357a068 Got dang quotation mark 2018-04-15 17:22:21 -05:00
Mewchild
8b469c4ec7 Adds Zigfe's Fluff Item 2018-04-15 17:11:08 -05:00
HzDonut
700c902d14 Modified LeMat Fluff Weapon (#3337) 
* LeMat

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm
 2018-04-14 19:41:19 -04:00
Arokha Sieyes
e9009507d8 Remove Aronai custom bag 
Medical bags ARE blue now, I don't need a custom blue one, just the ID that came in it.
 2018-04-13 20:21:25 -04:00
Cameron653
b3efd60a72 Merge branch 'master' into SILENCEDMP5A5_FLUFF 2018-04-11 00:37:26 -04:00
Arokha Sieyes
44437da3c3 Fixes #3368 - Teleporting now often respects dropnom pref 2018-04-08 21:42:33 -04:00
Cameron653
1b447796de Moves to proper file 2018-04-08 21:05:47 -04:00
Cameron653
c026f42676 Adds SilencedMP5A5's fluff items 
https://forum.vore-station.net/viewtopic.php?f=27&t=1302
 2018-04-08 01:03:07 -04:00
Repede
27bfbb0555 Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2018-04-03 19:57:25 -04:00
Repede
ae850864ba Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
 2018-04-03 19:57:04 -04:00
lukevale
df45aec36e fixing a random bug 2018-04-03 01:27:49 -05:00
lukevale
64a892daed jiao fluff items 2018-04-03 01:25:40 -05:00
Repede
5e795d89ef Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2018-03-30 14:21:02 -04:00
Repede
7f299ea8a0 Fixing travis warning stuff! 2018-03-30 14:20:15 -04:00
lukevale
ec29d628bc noel uniform 2018-03-30 11:46:29 -05:00
izac joof forsgren
adb7d61f2c Merge pull request #93 from lukevale/master 
Noel Walsh's fluff stuffs
 2018-03-26 08:29:47 +02:00
lukevale
d95294b637 fixxing the issue with the earrings. 2018-03-25 22:57:45 -05:00
lukevale
c25a0bbfb0 MOAR FIXXXING 2018-03-25 17:24:29 -05:00
lukevale
9949e242ef MORE FIXXING 2018-03-25 17:23:12 -05:00
lukevale
f5b76990ec more fixing 2018-03-25 17:22:08 -05:00
lukevale
64ede614e0 fixing this because ??? 2018-03-25 17:21:41 -05:00
lukevale
66893ea985 more of Noel's fluff shits 2018-03-25 16:43:02 -05:00
izac112
6b4adfc99c Luke is no longer requesting it. 
Signed-off-by: izac112 <izac10@live.com>
 2018-03-24 16:13:45 +01:00
Arokha Sieyes
56fd510f3f Removes a bunch of my unused fluff stuff 2018-03-23 22:02:20 -04:00
Repede
11f4962e69 Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2018-03-23 20:25:47 -04:00
Repede
7c6aadd829 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/security.dm
#	code/game/area/Space Station 13 areas.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
 2018-03-23 20:25:18 -04:00
lukevale
cf4dcd0367 Noel Welsh's fluff items 2018-03-23 19:05:31 -05:00
lukevale
a70289246b emergancy fix! 2018-03-23 18:45:39 -05:00
lukevale
e591e340c3 spell checking :p 2018-03-23 12:54:15 -05:00
lukevale
7ba7e9645f added in Maxie's fluff collar (right file) 2018-03-23 12:46:41 -05:00
lukevale
04af5e6f5a i fucked up :p 2018-03-23 12:46:08 -05:00
lukevale
7d2bc11a46 i fucked up :P 2018-03-23 12:45:58 -05:00
lukevale
b4504dbe70 Adds in Maxie's collar fluff item 2018-03-23 12:43:21 -05:00
Verkister
dd454644d1 Fixed leg wraps 
When no species are in the existing allowed list, no species can wear the thing.
 2018-03-20 15:10:42 +02:00
Arokha Sieyes
de9cd436f7 Fixes #3285 - Gilded cuffs not shown on mob 2018-03-18 15:17:22 -04:00
lukevale
65b706347a Update custom_items_yw.dm 2018-03-18 08:29:38 -05:00
lukevale
05b23da6fc Added in Eryn's kit 2018-03-18 04:12:19 -05:00
lukevale
c1c27563cc Update custom_boxes_yw.dm 2018-03-18 04:11:21 -05:00
lukevale
24aeb8db23 Update custom_items_yw.dm 2018-03-18 04:10:20 -05:00
Aronai Sieyes
baaafedecd Merge pull request #3170 from JoanRisu/Fluff_Items_worshop 
Return of the Fluff Items Workshop
 2018-03-16 21:31:09 -04:00
izac112
bea574861e Fluff Items 
Benl8561 - Quanah Hastings
Luke vale - Lena Shaw

Signed-off-by: izac112 <izac10@live.com>
 2018-03-14 17:42:35 +01:00
izac112
1c8c08505b Fluff Items 
Dushka - Saroth
Benl8561 - M.I.S.S.Y
Signed-off-by: izac112 <izac10@live.com>
 2018-03-14 16:14:22 +01:00
Dwaggy
e42a38fef2 Fluffstuff: Saur Darastrix: Backpack. 
*its about damn time*
 2018-03-11 18:43:22 +00:00
JOAN-RIG\Joan Risu
f5e2039dd5 removed invalid if statement from gunbuster. 2018-03-09 23:37:52 -08:00
Repede
46577b7321 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/mecha/combat/gorilla.dm
#	code/modules/vore/eating/bellymodes_vr.dm
 2018-03-06 18:11:39 -05:00
Aronai Sieyes
c1c1a398c6 Merge pull request #3181 from VOREStation/Cameron653-patch-1 
Fixes a fluff item
 2018-03-05 18:36:08 -05:00
Cameron653
a3d380d09d Fixes a fluff item 2018-03-04 17:25:49 -05:00
Konabird
a5b1befc6d Fixes Rischi's egg implant to actually work 2018-03-04 14:37:20 -06:00
Repede
f41b0b2390 Fookin fidget spinners 
And kitsune tail
 2018-03-04 00:03:44 -05:00