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
42,822 Commits 8 Branches 0 Tags
5d8f970d025a23faffb131b6607d914f05fbebc3
Commit Graph

31760 Commits

Author SHA1 Message Date
Aronai Sieyes
5d8f970d02 Merge pull request #3462 from VOREStation/aro-protbuckle 
Fix a few Protean bugs
 2018-04-14 12:56:30 -04:00
Aronai Sieyes
eb49e34378 Merge pull request #3456 from VOREStation/aro-vpfix 
Let's not add 'DM_TRANSFORM' once per time you've opened the vp
 2018-04-14 12:53:24 -04:00
Arokha Sieyes
84bbfcc787 Fix infinite loop of metal usage due to mismatch in values 2018-04-14 12:20:50 -04:00
Arokha Sieyes
be50f394a6 Transforming to/from protean blob unbuckles riders 2018-04-14 11:12:46 -04:00
Arokha Sieyes
4d80cd8df5 Proteans unbuckle targets before blobbing them 2018-04-13 21:08:06 -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
Arokha Sieyes
c2c3b08db6 Let's not add 'DM_TRANSFORM' once per time you've opened the vore panel, okay 2018-04-13 11:29:49 -04:00
Aronai Sieyes
73d841c9c8 Merge pull request #3451 from VOREStation/aro-neertipick 
Optimizes Powercell Update Icons
 2018-04-12 19:11:02 -04:00
Neerti
f80fe6a1c9 Optimizes Powercell Update Icons 2018-04-12 18:53:47 -04:00
Aronai Sieyes
83c27b175f Merge pull request #3446 from Heroman3003/fuzzy-legcuffs 
Added fuzzy legcuffs
 2018-04-12 18:42:54 -04:00
Heroman3003
dd2a46281e Added fuzzy legcuffs 2018-04-13 04:56:16 +10:00
Aronai Sieyes
791b5a4155 Merge pull request #3387 from KasparoVy/small_raptor_big_problem 
Fix Teshari Tail-hair Rendering
 2018-04-12 12:03:58 -04:00
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
5ff4f49cba Merge pull request #3437 from Verkister/patch-14 
Fixes teal carpets.
 2018-04-12 11:51:58 -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
Aronai Sieyes
c1deb676ca Merge pull request #3444 from VOREStation/aro-protfixagain 
Couple more Protean fixes, + darksight
 2018-04-12 11:51:03 -04:00
Verkister
90175bb1aa adds proper bags 2018-04-12 09:26:02 +03:00
Leshana
54101f8dfd Switch frame construction menu to have a cancel button. 
Instead of having a whole frame type dedicated to giving a "Cancel" option... lets just tell BYOND to add a cancel button to the menu.
 2018-04-11 21:52:34 -04:00
Leshana
49e71b95a6 Fix wall frames dropping steel and bugging on failure to place. 
Previously, if you tried to place a frame on a wall and it failed (due to something already being there etc)  you would no longer be asked what type to use next time you try, and it will runtime.
Fixes this by performing the safety checks *before* asking you want you want to build.  Since the checks don't depend on what type you want to build anyway its fine.
 2018-04-11 21:52:33 -04:00
Leshana
a6a396181e Fix allowing frames on walls with machine-under-construction on it already. 
Add /object/structure/frame to the list of objects that count as wall items. Also convert from strings to actual type paths.
... and fix the paths that haven't existed for four years.  Properly speaking it should be a dynamically generated list at some point.
 2018-04-11 21:52:32 -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
Leshana
c481f01343 Fix building frames on walls and windows. 
try_build() has long accepted `user` parameter, but nothing that called try_build actually passed it!
Upgraded try_build on APC to use the user parameter, and switched to use to_chat while I was there.
 2018-04-11 19:45:04 -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
Verkister
fd8ccbedd9 Update flooring_premade.dm 2018-04-11 17:25:51 +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
08f840991d Fixes teal carpets. 
Unnecessary and unmarked vorestation edit. Our carpet_vr.dmi was exactly the same as polaris, but without the teal carpets, surprise!

Fixes #3381
 2018-04-11 14:08:40 +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
KasparoVy
58251baa3a Fix Teshari Tail-hair Rendering 
Add the '_s' suffix to the icon state in the tail hair stage of tail icon generation.
This fixes an issue where Teshari tail hair wasn't rendering.

Also amends the colouration (was necessary for this to work for us) since VOREStation uses multiplicative blending
 2018-04-10 20:06:53 -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
Leshana
4b24fd1a6a Merge pull request #3404 from Verkister/cargostockings 
Adds a bunch of stuff to cargo selection.
 2018-04-10 18:11:55 -04:00
Arokha Sieyes
82c05428e1 Some protean fixes (regen, size as blob, gender) 2018-04-10 18:10:14 -04:00
Aronai Sieyes
d8616f0447 Merge pull request #3408 from Verkister/colormate 
Adds a machine for recoloring apparel ingame.
 2018-04-10 18:04:43 -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
Verkister
7dd311d088 Squashed commit of the following: 
commit bd470fd0276e83fa1516cc1b966308165d081b1b
Author: Verkister <superverkelian@hotmail.com>
Date:   Tue Apr 10 20:45:00 2018 +0300

    Update painter_vr.dm

commit 12e39bcec9b717d477a64aca0f8dfe917917986b
Author: Verkister <superverkelian@hotmail.com>
Date:   Mon Apr 9 09:34:50 2018 +0300

    Update painter_vr.dm
 2018-04-10 21:27:47 +03: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
Aronai Sieyes
9fbbcac1da Merge pull request #3414 from deathride58/BATTERUP 
Adds the ability for meteors to be deflected by baseball bats
 2018-04-10 12:39:04 -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