cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 6 Branches 0 Tags
c1d35bc97dccf68656ab1f08a8c26928afc4357e
Commit Graph

25728 Commits

Author SHA1 Message Date
JoanRisu
c1d35bc97d Step one we need to talk, you say conflicting files kinda suck. 2017-03-09 01:13:49 -08:00
JoanRisu
37e6655ae7 Revert "Attempted fix on Tasald's clothes." 
This reverts commit ab0ee8a37e.
 2017-03-09 01:09:47 -08:00
JoanRisu
ab0ee8a37e Attempted fix on Tasald's clothes. 2017-03-09 00:51:50 -08:00
JoanRisu
997623c2da Adds some 64x32 two-handed gun sprites to the code. 2017-03-05 15:43:41 -08:00
Arokha Sieyes
0b060ece54 Merge pull request #1097 from VOREStation/aro-flippy 
Tweak *flip
 2017-03-05 02:19:36 -05:00
Arokha Sieyes
7ae58372af Merge pull request #1099 from VOREStation/aro-kinrename 
KIN -> KHI Renames
 2017-03-05 02:19:15 -05:00
Arokha Sieyes
66b0429e6d Merge pull request #1098 from VOREStation/aro-morepanel 
Adds even more robust transfer checking?
 2017-03-04 22:17:24 -05:00
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
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
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
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
56b4f7464b Merge pull request #1087 from VOREStation/aro-cryorecur 
Makes cryopods cryo mobs recursively
 2017-03-04 01:50:38 -05:00
Arokha Sieyes
11aded02c7 VR specific changes for previous commit 2017-03-04 01:33:53 -05:00
Arokha Sieyes
7bc26bfc46 Make Cryopod despawn recursive 
So mobs being held (teshari, etc) are handled properly rather than simply deleted and not removed from the datacore, having their job slots occupied forever.
 2017-03-04 01:33:29 -05: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
facd055d07 Merge pull request #3037 from VOREStation/traybuckle 
Fix two extra robust bugs
 2017-03-03 18:23:25 -06:00
Leshana
1c3655a5bd Fix server startup runtimes from uninitaizlied using_map 
* That if statement wasn't heping anyone as it was.
* Strangely however, even an `if(using_map)` doesn't help, as using_map is in some crazy BYOND limbo state at that point in world init.  but checking istype() succeeds in figuring out its not real.
 2017-03-03 19:07:40 -05:00
Arokha Sieyes
fe641793cb Merge pull request #1075 from VOREStation/blueprints 
Extend Station Blueprints to consider outdoor mining areas as "space"
 2017-03-03 18:53:05 -05:00
Anewbe
01109d3b8d Fixes the slowdown bug 2017-03-03 17:38:55 -06:00
Leshana
8ede18c3ba Extend Station Blueprints to consider outdoor mining areas as "space" 
* Allows constructing new rooms out of the asteroid!  Previously blueprint couldn't because it wasn't technically "/area/space"
* Also moved the list of what area types count as space or protected to variables so its not a list embedded in the middle of a proc...
 2017-03-03 18:26:51 -05: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