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,696 Commits 6 Branches 0 Tags
4f06a180573450b0b39e5be21f1b3db87bee2bc0
Commit Graph

16055 Commits

Author SHA1 Message Date
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
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
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
JoanRisu
7653763fc4 Merge pull request #1059 from Poojawa/trekuniforms 
trek uniforms + loadout listing
 2017-03-03 01:05:53 -08:00
Poojawa
7891bf2b52 Trek Uniforms 2017-03-03 02:51:05 -06:00
JoanRisu
ceca64804d Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2017-03-02 23:28:45 -08:00
JoanRisu
3f26a1d223 Some personal changes to my items and adds a dune buggy for science expeditions. 2017-03-02 23:17:04 -08:00
Arokha Sieyes
513e7c0e57 Comment out noisy message 2017-03-03 00:43:35 -05:00
Arokha Sieyes
8ad568ae18 Merge pull request #1060 from VOREStation/aro-aivore 
Adds AI Vore Capability
 2017-03-03 00:27:06 -05:00
Arokha Sieyes
a3e5e7327f Initial commit of new map system for Virgo 2017-03-02 23:34:43 -05:00
Arokha Sieyes
8749e2bc02 Fix custom ear sprite code 2017-03-02 22:50:59 -05:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Spades
7b194cf09c Fixes broken dead alien icons 2017-03-02 22:04:39 -05:00
Arokha Sieyes
c5c0af4f2f Adds AI Vore Capability 
Also just general AI QOL things.

AIs have a "Hardlight Noms" verb in the Vore tab. When their hologram is on top of a person, they can pick this, and will homf them. Takes 5 seconds, neither of you can move or it cancels. Holograms with someone inside become almost opaque and purple. They also have different examine text.

A hologram with someone inside cannot move through glass/tables/etc. Pressing "Hardlight Noms" again will give the option of dumping the prey out. Derezzing the hologram will also do this. Also because the hologram can be 'blocked' by things now when full, moving the hologram off the screen will derez it and dump the prey too.

AIs can examine mobs now to get flavortext and OOC notes. Shift-click only. This is for annoying technical reasons. Sorry to those that like to right-click and click examine.
 2017-03-02 21:54:19 -05:00
Anewbe
a0198fb947 Merge pull request #3022 from VOREStation/infections 
Infection code improvement
 2017-03-02 19:54:26 -06:00
Anewbe
9ca2d1223e Merge pull request #3031 from Dankman/master 
Fixing issues with the Xenobiology Computer.
 2017-03-02 17:51:48 -06:00
Anewbe
a45ef074bd Merge pull request #3029 from VOREStation/blood 
Make blood loss/heart removal make sense
 2017-03-02 17:03:44 -06:00
Anewbe
bb2adf1290 Merge pull request #3021 from Neerti/2/23/2017_porting_map_datum_system 
Ports a large chunk of the map datum system that europa/bay uses.
 2017-03-02 16:32:02 -06:00
Arokha Sieyes
520812ffb7 Merge pull request #1057 from Yoshax/loadout_stuff 
Colorable loadout items
 2017-03-02 16:09:13 -05:00
Poojawa
1375db16bc fixes typos 2017-03-02 15:06:48 -06:00
Poojawa
c062a0cfe1 trek uniforms + loadout listing 2017-03-02 12:00:19 -06:00
Yoshax
94294f0a3f Colorable loadout items 2017-03-02 12:56:09 +00:00
Arokha Sieyes
8e09140669 Merge pull request #1051 from VOREStation/aro-spacechatter 
Space Chatter
 2017-03-02 00:44:44 -05:00
Arokha Sieyes
172fc03254 Merge pull request #1052 from VOREStation/parts-lathe 
Parts Lathe - Phase 1
 2017-03-02 00:43:20 -05:00
Dhaeleena
7712aabda9 Permit for cat gun 2017-03-01 19:58:33 -03:00