cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-24 00:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,806 Commits 11 Branches 0 Tags
b08f0db2bb4cdae2ad9a99f54cec9cdbd149d0e6
Commit Graph

20557 Commits

Author SHA1 Message Date
Aronai Sieyes
b08f0db2bb Merge pull request #3406 from Cameron653/SILENCEDMP5A5_FLUFF 
Adds SilencedMP5A5's fluff items
 2018-04-12 12:01:42 -04:00
Aronai Sieyes
b46816f01d Merge pull request #3436 from Verkister/patch-13 
Nerfs apex metabolism
 2018-04-12 11:52:10 -04:00
Aronai Sieyes
298def0af5 Merge pull request #3438 from Verkister/dur 
Adds deer taur.
 2018-04-12 11:51:42 -04:00
Aronai Sieyes
8afd5cad9a Merge pull request #3441 from Verkister/rous 
Adds giant rat voremob.
 2018-04-12 11:51:29 -04:00
Aronai Sieyes
ae4c5a0d95 Merge pull request #3443 from VOREStation/aro-digestaddons 
Adds 'mode addons' feature to bellies to replace several modes
 2018-04-12 11:51:15 -04:00
Arokha Sieyes
474bb3c8c8 Couple more Protean fixes, + darksight 
Fixes a blob transform check. Also they get a smidge of darksight (the minor trait). I'm sure they have expensive sensors, but giving them the taj darksight seems meh.
 2018-04-11 20:55:54 -04:00
Arokha Sieyes
4c604fb8da Adds 'mode addons' to bellies to replace several modes 2018-04-11 19:22:20 -04:00
Verkister
14ad23f8e6 mouse 2018-04-11 22:34:44 +03:00
Aronai Sieyes
b427bca859 Merge pull request #3423 from Verkister/newvoreagain 
Some vore tweaks. (new gurglemodes will hopefully be back in another PR)
 2018-04-11 14:37:20 -04:00
Verkister
2dec2545e5 Adds giant rat voremob. 
-Currently only available via pred crate/shenanigans.
-This dude is friends with regular mice but will gladly kick any other ass.
 2018-04-11 20:44:53 +03:00
Aronai Sieyes
2f04ff30cb Merge pull request #3433 from VOREStation/aro-protwork 
Fix another protean bug (resizing message)
 2018-04-11 10:23:44 -04:00
Verkister
9f21628619 Adds deer taur. 
-Adds dual color deer taur.
-Sort of fits the lizardtaur saddlebag gear as well so I lazily made it accept the deer too for now.
 2018-04-11 17:14:21 +03:00
Verkister
4d40702f3e Nerfs apex metabolism 
Now it's like more consistent with the steps between other modes.
 2018-04-11 09:08:39 +03:00
Cameron653
b3efd60a72 Merge branch 'master' into SILENCEDMP5A5_FLUFF 2018-04-11 00:37:26 -04:00
Arokha Sieyes
3776c21563 Fix another protean bug (resizing message) 2018-04-10 22:16:36 -04:00
Verkister
d8efac9cb0 dunno 2018-04-11 01:23:44 +03:00
Aronai Sieyes
dc7cefdd0d Merge pull request #3421 from VOREStation/aro-protwork 
Some protean fixes (regen, size as blob, gender)
 2018-04-10 18:19:32 -04:00
Arokha Sieyes
82c05428e1 Some protean fixes (regen, size as blob, gender) 2018-04-10 18:10:14 -04:00
Aronai Sieyes
1b5e92329d Merge pull request #3420 from VOREStation/aro-fixscpersist 
Set appropriate vars for persisting adminspawned characters
 2018-04-10 18:04:29 -04:00
Verkister
ee0224d794 Removes some changes, clarifies ID description 2018-04-10 23:03:18 +03:00
Spades
24217b12a8 Merge pull request #3389 from Verkister/mobvors 
Fixes resting and vore icon issues with mobs and silicons
 2018-04-10 14:44:36 -04:00
Aronai Sieyes
0e62b4a159 Merge pull request #3413 from VOREStation/aro-telenompref 
Fixes #3368 - Teleporting now often respects dropnom pref
 2018-04-10 12:51:26 -04:00
Verkister
6b535efd27 Adds some new gurglemodes and other tweaks 
-Adds numbing item friendly gurglemode.
-Adds item friendly strip digestion. (still soggy though)
-Adds strip absorption. (absorb naked victim, leave their stuff in gut)
-Makes absorption mute the drained absorbee's hunger noises if enabled.
-Makes draining and absorption speeds scale with gurgledamage settings.
-Also makes them affect borg charges.
-Disables item friendly gurgles completely ruining IDs, the likely most important item the prey wants spared when suggesting the mode. (still messy though)
-Makes borg sleeperbelly sounds use the new pref-respecting noise system.
-Adds a finisher gurgle and ding sound to finished self-clean cycle.
 2018-04-10 10:00:35 +03:00
Arokha Sieyes
63d53a054f Set appropriate vars for persisting adminspawned characters 2018-04-09 20:47:44 -04:00
Verkister
5e0ed0585f done 2018-04-09 23:40:20 +03:00
Leshana
98d5f62250 Merge pull request #3400 from VOREStation/polaris-sync-2018-04-04 
Polaris Sync 2018-04-04
 2018-04-09 13:28:19 -04:00
Leshana
a2b40e5aef Merge pull request #3411 from Heroman3003/meson-overlay-fix 
Fixed mesons NIFSoft overlay not highlighting open spaces above
 2018-04-09 07:23:14 -04:00
Arokha Sieyes
d67f433f22 Fixes #3344 - Holocarp set DM_HOLD when holodeck is safe 2018-04-08 22:00:10 -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
Heroman3003
046cf046d8 Fixed mesons NIFSoft overlay not highlighting open spaces above 2018-04-09 10:57:23 +10:00
Aronai Sieyes
9daefbe6e6 Merge pull request #3358 from Verkister/ttail 
Fixes feathered tesh tail into proper dual-color format.
 2018-04-08 20:44:24 -04:00
Aronai Sieyes
c39a91eae1 Merge pull request #3325 from VOREStation/Cameron653-patch-1 
Removes excavation drill since it's been ported upstream
 2018-04-08 20:41:11 -04:00
Cameron653
7c794107d3 Ckey locks it 2018-04-08 12:52:19 -04:00
Cameron653
e835ce0965 Update void_vr.dm 2018-04-08 12:50:54 -04:00
Spades
a72abf203d Merge pull request #3407 from Little-119/rings-fix 
Changes wedding rings to be a subtype of ring
 2018-04-08 07:26:38 -04:00
Little-119
6ebe2269c4 Changes wedding rings to be a subtype of ring 
Also moves them to their own .dm, since they're now a subtype of the thing in rings.dm. Also changed bethrothed to spouse, as the former is usually before marriage and not after.

Benefits of this include: Being able to wear gloves over wedding rings. Making them tiny instead of small. Making their gender neuter instead of plural, so it wont say "some wedding ring" when you examine someone wearing them. Probably more good things.

Issue reported by HzDonut.
 2018-04-08 01:06:36 -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
Leshana
e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04 
# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
 2018-04-06 15:40:06 -04:00
Aronai Sieyes
e49e883f5f Merge pull request #3384 from Cameron653/VOX_STUFF_FIX 
Fixes vox not having hardsuit sprites.
 2018-04-06 15:39:55 -04:00
Aronai Sieyes
58a2459c6d Merge pull request #3385 from Michiyamenotehifunana/egun-replacer 
Overrides the base Energy Gun sprite with a good looking one
 2018-04-06 15:36:59 -04:00
Aronai Sieyes
2f8063c560 Merge pull request #3380 from Ketrai/patch-8 
Nerfs solargrub drain speed.
 2018-04-06 15:34:44 -04:00
Aronai Sieyes
dc3a587b7f Merge pull request #3390 from Verkister/collors 
Small Shock/Holo collar tweaks.
 2018-04-06 15:11:16 -04:00
Leshana
c8dd30846c Merge pull request #3378 from VOREStation/polaris-sync-2018-03-30 
Polaris Sync 2018-03-30
 2018-04-06 14:42:19 -04:00
Michiyamenotehifunana
2318db9cd7 Improves contrasts on sprites and removes the need for mirroring upstream sprites 2018-04-06 17:59:10 +08:00
Ketrai
26d028a16f Update solargrub.dm 2018-04-06 11:40:26 +02:00
Verkister
04a6d1a4b0 more fixes etc 2018-04-06 10:48:38 +03:00
Verkister
5d8b6cd1a6 Small Shock/Holo collar tweaks. 
-Updates their old >> dialogue.
-Makes shock collars taggable.

Was gonna fix them showing up in forced lowercase on people but that turned out to be a separate polaris issue that I just opened a fix for up there.
 2018-04-05 15:48:03 +03:00
Michiyamenotehifunana
50d7706cd2 Fixes Pathing 2018-04-05 20:21:15 +08:00
Verkister
4a81fcf8d8 Fixes a bunch of simple animal vore icon issues. 2018-04-05 09:59:24 +03:00