cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 21:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,766 Commits 6 Branches 0 Tags
ba36df71a7657bf6656c7b19f81b51e5b27875dc
Commit Graph

16690 Commits

Author SHA1 Message Date
Arokha Sieyes
ffac4f72ba KIN -> KHI Renames 
They don't have a Navy, I dunno why I put that. Also checks the file that SOMEONE keeps forgetting to check.
 2017-03-04 22:14:45 -05:00
Arokha Sieyes
0937ee103d Further tweaks flip chances 
Eh 2% may have been a bit overboard.
 2017-03-04 22:10:30 -05:00
Yoshax
eeed8496cf Fixes the paperwork date insert 2017-03-05 03:10:11 +00:00
Arokha Sieyes
f826a156b4 Adds even more robust transfer checking? 
I really don't understand what's going wrong.
 2017-03-04 21:45:21 -05:00
Neerti
411bd2b05b Ports Turbolifts from Bay. 2017-03-04 21:35:00 -05:00
Arokha Sieyes
9f1db703d2 Message tweaks. 2017-03-04 21:24:40 -05:00
Arokha Sieyes
f36d52043c Raise *flip trouble chances slightly 
Also make synth limbs fly off because they can't break. Wouldn't want them to be left out of the fun.
 2017-03-04 21:18:54 -05:00
Arokha Sieyes
5085ed4941 Merge pull request #1095 from Wickedtemp/Wickedtemp-patch-1 
Fluff item change for Tempest
 2017-03-04 19:49:46 -05:00
Arokha Sieyes
bdd01e3c8a Merge pull request #1094 from VOREStation/aro-flippy 
Remove a world.log reference
 2017-03-04 19:48:07 -05:00
Arokha Sieyes
b3cebd2b02 Update custom_clothes_vr.dm 
Muh escaped quotes.
 2017-03-04 19:45:36 -05:00
Wickedtemp
2566cfe8b6 Fluff item change for Tempest 
It changes the examine text and the item name for Tempest's Medical Hud, from 'Purple MedHUD' to 'Tempest's MedHUD'.
 2017-03-04 18:35:18 -06:00
Arokha Sieyes
0a1f86594c Remove a world.log reference 
Left this in. Wouldn't have printed to anyone since it's world.log not world, but still shouldn't be there.
 2017-03-04 19:08:31 -05:00
Arokha Sieyes
02d0b229d5 Merge pull request #1092 from VOREStation/aro-flippy 
Improves *flip
 2017-03-04 18:42:31 -05:00
Arokha Sieyes
5b13bcbb50 Merge pull request #1089 from Yoshax/ewwwfatpeople 
Nutrition + Diet Changes
 2017-03-04 18:35:07 -05:00
Arokha Sieyes
89e42fc255 Improves *flip 
Yessss. Yesssssssssss.

Base 1% chance to break a leg or foot.
+1% for taurs
+2% for any missing part
Can't flip if you don't have one full leg/foot or two legs w/o feet (aka you need at least 2 parts from lleg+rleg+lfoot+rfoot)
 2017-03-04 18:31:16 -05:00
Arokha Sieyes
3fed08df6f Merge pull request #1091 from VOREStation/aro-robodoggo 
Adds Serdy's Robobutt
 2017-03-04 17:38:37 -05:00
Arokha Sieyes
755bc0d7d1 Adds Serdy's Robobutt 
Also adds a general cyberlimb whitelisting system since that's apparently needed now.

App: http://forum.vore-station.net/viewtopic.php?f=45&t=875
 2017-03-04 17:25:17 -05:00
Anewbe
283071d9db Merge pull request #3035 from Neerti/3/2/2017_example_map 
Adds Multi-Z Test Map
 2017-03-04 15:26:49 -06:00
Arokha Sieyes
4f06a18057 Dragor fluff items, Aronai fluff item fixes 
Also fixes *flip to not print an error message (emotes must have messages that they display) and redoes how vials start with reagents to make it easier to code them. Also swapping genders as a promethean won't randomize your hair anymore. That was silly, and relevant to Dragor's thing.
 2017-03-04 16:04:43 -05:00
Arokha Sieyes
05719b68b4 Update pill.dm 
Spell it out fam
 2017-03-04 14:00:43 -05:00
Yoshax
f54ae4be13 Makes the diet pill more effective, and makes Lipozine more effective in general 2017-03-04 16:25:32 +00:00
Yoshax
17197cd66a Makes food less filling so you can eat more in a reasonable fashion 
Like being able to drink a protein shake when you're hungry and now end up in grey overfed for 9 hours
 2017-03-04 16:17:55 +00:00
Poojawa
780c1f9973 Backflips are back in style 2017-03-04 04:57:01 -06:00
Arokha Sieyes
d216ee9ad9 Merge pull request #1086 from VOREStation/aro-sleevatk 
Prevent resleever attack messages
 2017-03-04 01:10:36 -05:00
Arokha Sieyes
6199360d9d Merge pull request #1085 from VOREStation/aro-shrinkdupe 
Remove duplicate shrinkray design
 2017-03-04 01:00:15 -05:00
Arokha Sieyes
4837551e28 Prevent resleever attack messages 
Don't call ..() when attacked by grabs.
 2017-03-04 00:59:42 -05:00
Arokha Sieyes
1cb8406564 Remove duplicate shrinkray design 
It has two designs in R&D for some reason. Removing the dupe.
 2017-03-04 00:39:41 -05:00
Arokha Sieyes
ecff631973 Let's prometheans learn an extra language 
Fixes #1021

I dunno how many would be fair, but I don't think anyone will argue with just adding one.
 2017-03-04 00:27:41 -05:00
Arokha Sieyes
3fb7405634 Merge pull request #1082 from Yoshax/tailbait 
Fixes a couple of tail issues
 2017-03-03 23:48:39 -05:00
Yoshax
b16c80d338 Fixes a couple of tail issues 2017-03-04 03:58:57 +00:00
Arokha Sieyes
fb81d51bc0 Merge pull request #1080 from VOREStation/aro-fixsubtle 
Renames mlemawoo proc
 2017-03-03 22:24:25 -05:00
Arokha Sieyes
e779b9b59d Renames mlemawoo proc 
There already was an emote_vr y'see. And this broke subtle.
 2017-03-03 21:58:38 -05:00
Arokha Sieyes
9c27dede54 Fix color_mult species. 
THIS IS WHY WE ADD COMMENTS TO AREAS WE EDIT.
 2017-03-03 20:34:08 -05:00
Arokha Sieyes
47e1a079b1 Merge pull request #1077 from VOREStation/aro-030217sync 
Emerg Revert
 2017-03-03 19:52:34 -05:00
Arokha Sieyes
d345d74974 VS revert 2017-03-03 19:49:02 -05:00
Arokha Sieyes
1ad97486d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-030217sync 
# Conflicts:
#	code/modules/organs/organ_icon.dm
 2017-03-03 19:39:56 -05:00
Anewbe
c831df104b Merge pull request #3041 from PolarisSS13/revert-3018-master 
Revert "BlockHeadHair doesn't make players bald."
 2017-03-03 18:29:46 -06:00
Anewbe
01109d3b8d Fixes the slowdown bug 2017-03-03 17:38:55 -06:00
Arokha Sieyes
79805c8cbe Adds *mlem and *awoo 
YOU. MAKE. ME. ***SICK.***

That you somehow convinced me to do this.
 2017-03-03 18:19:39 -05:00
Anewbe
81549fc965 Revert "BlockHeadHair doesn't make players bald." 2017-03-03 17:19:07 -06:00
Arokha Sieyes
4c3504365b Merge pull request #1071 from VOREStation/aro-softproblems 
Redo Vore Panel Interactions
 2017-03-03 14:48:05 -05:00
Arokha Sieyes
97ca5c2542 Merge pull request #1062 from VOREStation/aro-030217sync 
Polaris Sync
 2017-03-03 14:29:40 -05:00
Arokha Sieyes
171ee67d99 Merge pull request #1068 from Screemonster/xenoiconandferal 
more xenochimera tweaks
 2017-03-03 14:28:10 -05:00
Arokha Sieyes
809110eda1 Merge pull request #1065 from JoanRisu/Fluff_Items_worshop 
Fluff items worshop.....15???
 2017-03-03 14:26:43 -05:00
Arokha Sieyes
3986b40007 One more small tweak for prey in bellies 
Can't touch items that have already left
 2017-03-03 14:23:33 -05:00
Arokha Sieyes
fcd57c1131 Redo Vore Panel Interactions 
- Redid belly interactions into a hide-able section to keep it nice and clean.
- Changed most 'error' messages into modal alert boxes to make it obvious.
- Remade name/desc/bellycount rules into defines at the start of the file.
- Fixed transfer problems as far as I can tell (Fixes #1063 Fixes #763)
- Can't delete transfer location bellies. Notifies you what points at it and tells you to change it first.
- Get rid of the -1% thing. Just set it to 0% if you don't want it to happen.
- Added a little '?' help button for general interaction info.

https://gyazo.com/b8fb247c0ac101753795a400d61240d0
 2017-03-03 14:20:37 -05:00
Screemonster
26cb63f7fc preview icon for xenochimera, fixes feral in stasis, raises shock threshold 2017-03-03 16:01:17 +00:00
Neerti
0f781e36a7 Adds Multi-Z Test Map 2017-03-03 09:40:34 -05:00
JoanRisu
3785bd3700 ~Changes flag for squirrelkin language 
~changes Joan's bag and its icon
+Adds Dhael's gun and permit to her spawnlist
~debug attempt on Crescent Rose's sprite changing code. Also changes sprites.
 2017-03-03 03:39:00 -08:00
Screemonster
89a0559077 Add's vinjj's fancy bandana 2017-03-03 11:33:02 +00:00