cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,707 Commits 5 Branches 0 Tags
8e55f94e971a3e86a2354581e308f44ff631b287
Commit Graph

29317 Commits

Author SHA1 Message Date
Arokha Sieyes
8e55f94e97 Merge pull request #2484 from Verkister/gogliberation 
Unrestricts my fluff goggles for general loadout use.
 2017-11-16 15:31:48 -05:00
Arokha Sieyes
bd5e5cf08b Merge pull request #2483 from VOREStation/Auream-Imperium-fix 
Update organizations_vr.dm
 2017-11-16 15:30:33 -05:00
Verkister
7c7794f74f Unrestricts my fluff goggles for general loadout use. 
-Opie's orange goggles and Cameron's aesthetic science goggles.
-The orange goggles can also be worn on ear slot in order to have their up state above the hair layer.
 2017-11-16 09:31:27 +02:00
Spades
64da022bd6 Merge pull request #2473 from Cameron653/SILVERTALISMAN_CUSTOM_IMPLANT 
Silvertalisman custom implant
 2017-11-15 19:46:10 -05:00
Spades
c501e16e05 Update organizations_vr.dm 
Auream Imperium not Imperium Auream.
 2017-11-15 19:45:25 -05:00
Spades
55837653b2 Merge pull request #2470 from Verkister/wrecc 
Dogborg wreck and rest icons now work properly!
 2017-11-15 11:01:21 -05:00
Spades
904899fcde Merge pull request #2477 from Verkister/plowthatnerd 
Adds an inconveniently evil new negative trait.
 2017-11-15 10:48:55 -05:00
Verkister
fb7ebab196 Update living.dm 2017-11-15 16:39:33 +02:00
Verkister
b4c707e591 Update living.dm 2017-11-15 07:56:01 +02:00
Verkister
f02f3b2846 Adds an inconveniently evil new negative trait. 
-"Lightweight", cost -4, every non-helpful bump received has a 50% chance to knock you down.
 2017-11-14 20:48:40 +02:00
Verkister
8c1fb156be Adds a cosmetic "armor vest" taur saddlebag subtype. 
-Works with 4-legged taurs as the other taurbags.
-Has normal backpack stats whereas the other saddlebags have duffle stats.
 2017-11-14 16:18:47 +02:00
killer653
0f8c083837 SilverTalisman Whitelist Implant 2017-11-13 21:18:33 -05:00
Verkister
c23ac9d849 unrelated runtime fixes 2017-11-14 01:49:14 +02:00
Cameron653
9af1fa5065 Merge pull request #2472 from VOREStation/Cameron653-patch-2 
Stop causing bots to kill everyone, jesus christ
 2017-11-13 17:47:59 -05:00
Cameron653
de0ce9285d Stop causing bots to kill everyone, jesus christ 2017-11-13 17:38:19 -05:00
Cameron653
a37632e929 Prevents vatborns from spawning 2017-11-13 17:24:55 -05:00
Verkister
b0a72d2983 Rest 2017-11-13 23:32:38 +02:00
Verkister
3b5f663f08 snib 2017-11-13 22:21:47 +02:00
Verkister
7ead6799df Got them dogborg wreck icons working. 
-Yeah I did.
 2017-11-13 22:13:35 +02:00
Cyantime
ce21d46c7d Can't open blast doors with your face 2017-11-12 16:40:41 -05:00
Spades
c37c291c10 Merge pull request #2455 from VOREStation/Cameron653-patch-1 
Loadout edits
 2017-11-12 11:55:17 -05:00
Spades
0761203b90 Merge pull request #2444 from Cameron653/master 
Makes it so nevreans can fly w/ default tail.
 2017-11-12 11:52:03 -05:00
Spades
4de5f0b989 Merge pull request #2450 from Verkister/fuzzytoggle 
Adds toggleable character pref for sharp/fuzzy scaling. (Tested.)
 2017-11-12 11:49:29 -05:00
Spades
5cea42a2b8 Merge pull request #2440 from Verkister/orgurg 
Makes HV at least somewhat feasible with organ nutrition.
 2017-11-12 11:49:10 -05:00
killer653
3e2cf7c9b7 Makes stairs function as before 
Video: https://i.imgur.com/EvqCQux.gifv
 2017-11-12 01:15:33 -05:00
killer653
b1ce51c2b3 Adds in Drop Noms 
Information to include in PR
Panel: https://i.imgur.com/Ru0Mb2w.png
Pred falling onto prey: https://i.imgur.com/Y28TaJn.gifv
Prey falling onto pred: https://i.imgur.com/DzZlQbr.gifv
Person falling onto person w/ unaligned prefs:
https://i.imgur.com/DzZlQbr.gifv
Pred falling onto prey does anywhere from 0 to 30 damage to the pred
Prey falling into pred does 0 damage to both.
Unaligned causes the faller to suffer damage & a stun, person being
fallen on gets stunned
Dropping onto someone w/ dropnom: https://i.imgur.com/PywIfAI.png
Dropping onto someone w/ dropnom: https://i.imgur.com/H7o5g9f.png
 2017-11-12 00:32:54 -05:00
Cameron Lennox
4f289c84c6 Agh 2017-11-11 19:24:59 -05:00
Cameron Lennox
c9ee48b78f WIP 2017-11-11 19:24:35 -05:00
Verkister
b6d4686ba0 Update bellymodes_vr.dm 2017-11-11 17:07:28 +02:00
Verkister
09591d9395 It works now. 2017-11-11 16:00:37 +02:00
Cameron653
8714c006ff Update loadout_accessories.dm 2017-11-10 18:33:44 -05:00
Cameron653
d5e9f96493 Makes wallets (except for orange) free of cost 2017-11-10 18:29:44 -05:00
Cameron653
df89195c48 Makes tracking implant cost 0 
For preds
 2017-11-10 18:28:30 -05:00
Spades
70a33bde83 Merge pull request #2433 from Screemonster/feralfixmaybe 
hunger feral tweak and bugfix
 2017-11-10 16:37:28 -05:00
Spades
94d61dc02e Merge pull request #2430 from Verkister/previewscales 
Preview nitpickery.
 2017-11-10 16:37:08 -05:00
Spades
7a7e0f915c Merge pull request #2452 from Cameron653/master 
Mid November Polaris Sync
 2017-11-10 16:36:48 -05:00
Cameron653
6922dff544 typo fix 2017-11-10 14:28:50 -05:00
killer653
70e53b96bb Polaris Sync 2017-11-10 11:37:41 -05:00
Verkister
72edb34ecc Adds toggleable character pref for sharp/fuzzy scaling. 
-Yeah you should now be able to choose how you look.
-Especially benefitical for any character scaled to those atrociously fucked up deformation ranges.
-Can't really test it properly though due to the compile nature of the good ol' PIXEL_SCALE line in dm and my compy somehow forcing fuzzy on for some reason anyway. (my laptop's got the sharp mode tho)
-Kinda based on #1947 Go there for preview examples.
 2017-11-10 12:19:31 +02:00
Anewbe
1b6a4597e7 Merge pull request #4246 from MarinaGryphon/IE-Fixes 
Integrated Electronics fixes.
 2017-11-09 21:22:35 -06:00
Anewbe
6b6683ef74 Merge pull request #4236 from Mechoid/Flamethrower_Expansion_2 
Species Sprites for the Firebug voidsuit.
 2017-11-08 13:25:18 -06:00
Cameron653
9b467a488d fixes #2431 
fixes #2431
 2017-11-08 14:11:15 -05:00
Marina Gryphon
8b311ac237 Reverted some changes, apparently it was already fixed. 2017-11-08 09:28:29 -06:00
Marina Gryphon
5af691093e Re-fixed an issue with power transmitters. 2017-11-08 09:22:03 -06:00
Marina Gryphon
c755edda5b Removed a file I didn't mean to commit. 2017-11-08 08:37:16 -06:00
Verkister
7b145097e7 Update bellymodes_vr.dm 2017-11-08 16:34:35 +02:00
Marina Gryphon
091c58ec68 Fixed some IE bugs. 2017-11-08 08:33:07 -06:00
Verkister
badd59384f Makes HV at least somewhat feasible with organ nutrition. 
-Yeah you don't even get a single food bite worth of nutrition if your victim dies.
-This balances that some by giving severed organs an actual nutritional value instead of garbage treatment.
 2017-11-08 16:31:41 +02:00
Verkister
e9c61e640e organ buff 2017-11-08 09:50:17 +02:00
Verkister
b563c44e3f nerfed to half. 2017-11-08 09:34:56 +02:00