cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-31 11:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,823 Commits 8 Branches 26 Tags
16b37dfc19c13cc888ff7ac6b7ea43feeae6adf7
Commit Graph

8453 Commits

Author SHA1 Message Date
killer653
463b9c4dfb Edited files 2017-11-17 19:28:26 -05:00
killer653
da0bf3743b Polaris sync 2017-11-17 19:27:03 -05:00
Spades
a412c18614 Merge pull request #2469 from Verkister/gimmicktraits 
Adds 2 gimmick traits and borgo feeding.
 2017-11-16 22:36:46 -05:00
Ketrai
52d004c0fd Makes it solargrub larva produce solargrub meat. 
They just drop red meat right now, silly.
 2017-11-16 20:35:01 +01:00
Anewbe
1d9adcb285 Merge pull request #4267 from Neerti/11/14/2017_icon_scaling 
Makes Icon Scaling Great
 2017-11-16 01:52:05 -06:00
Anewbe
ff9a191135 Merge pull request #4265 from Atermonera/conscious_strip 
MouseDrop checks incapacitated() before giving inventory access
 2017-11-15 12:36:16 -06: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
Verkister
56257b302a Merge branch 'gimmicktraits' of https://github.com/Verkister/VOREStation into gimmicktraits 2017-11-15 17:52:47 +02:00
Verkister
a5ff9415fa Merge branch 'master' of https://github.com/VOREStation/VOREStation into gimmicktraits 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/blank_vr.dm
 2017-11-15 17:52:15 +02: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
Neerti
0315b18185 Makes Icon Scaling Great 
Scaling wasn't great before so no Again.
Makes most icons not get blurry when scaled.
Makes all /atom/movable s able to be scaled with the adjust_scale() proc.
Adds ability for species to get scaled automatically.  Currently no species does this, but it is an option in the future.
Adds four traits to adjust your mob scale.  It is purely cosmetic at this time.
 2017-11-14 19:32:49 -05: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
c7a3c92b1c Stops 0 force item paps turning borgs into pyrotechnical sparklers. (#4261) 
* Stops 0 force item paps turning borgs into pyrotechnical sparklers.
-That's just too much of a silly thing to happen without damage.

* Adds verb for party sparks.

* Update robot.dm
 2017-11-14 10:39:29 -06:00
Anewbe
3c151021c8 Merge pull request #4262 from Atermonera/AI_verbs 
AI verbs are no longer hidden
 2017-11-14 10:38:48 -06:00
Atermonera
ee8f3ffbce MouseDrop checks incapacitated() before giving inventory access 2017-11-13 23:46:11 -08:00
Verkister
540901e359 Update neutral.dm 2017-11-14 09:23:08 +02:00
Verkister
03121273a6 Update positive.dm 2017-11-14 09:21:32 +02:00
Atermonera
bb985c5d16 AI verbs are no longer hidden 2017-11-13 17:30:03 -08:00
Mechoid
f25a6bad5e Merge pull request #4256 from Anewbe/bignathi 
Unathi are bigger and have more max blood
 2017-11-13 16:13:40 -08:00
Verkister
c23ac9d849 unrelated runtime fixes 2017-11-14 01:49:14 +02:00
Verkister
b5b41ab187 move ya feet 2017-11-14 01:17:06 +02:00
Verkister
2daec6bdc2 Update neutral.dm 2017-11-14 00:58:04 +02: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
Verkister
c1f16e080e Adds 2 neutral gimmick traits and borgo feeding. 
-Trait 1, "Hard Feet" makes your feet glass shard resistant.
-Trait 2, "Trash Can" lets you dispose of snack wrappings on the go without littering or having to quest out in search of a disposal bin.
-Also adds trash feeding for janiborgo in a sibling snippet for the forementioned trait.
-Also added the old citadel era "robo kibble" to give the custom trash code file a first custom "trash" as well. Only in the code for now, not mechfab printable yet.
-I'm gonna toss Polaris an update that makes borgs not become sparkles on 0 force item paps brb.
 2017-11-13 20:01:58 +02:00
Anewbe
b897f2b2bf Simple mobs now have a var that can be toggled to make them taser immune 2017-11-12 17:41:00 -06: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
Anewbe
bc211b3a6d Unathi are bigger and have more max blood 2017-11-11 17:17:13 -06:00
Neerti
2ea87a0987 Merge pull request #4248 from Anewbe/invisiblity_examin 
People with low alpha (aka near-invisible) can no longer be examined
 2017-11-11 16:55:35 -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
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
Anewbe
ab39e29f04 People with low alpha (aka near-invisible) can no longer be examined 2017-11-08 23:50:35 -06:00
MarinaGryphon
58372ffa6a Fixes #4238. 
This has got to be too good to be true...
 2017-11-08 13:57:43 -06:00
Cameron653
9b467a488d fixes #2431 
fixes #2431
 2017-11-08 14:11:15 -05:00
Anewbe
c88d6cea9d Merge pull request #4232 from Verkister/Boom 
Fixes the severed legs crashing?
 2017-11-07 11:39:28 -06:00
Verkister
4311e32aa1 Fixes the severed legs crashing? 
-Hopefully finally yes.
-Got no proper environment to test if it actually fixes the thing, but extensive troubleshooting and pinpointing has eliminated the issue to the rendering of leg icons, which apparently had nothing in it to skip missing ones.
-Thing affects both, living mobs and ghosts alike, and being a cached icon generation also explains why it only happens once and not after the victims have rejoined.
 2017-11-06 16:47:32 +02:00
mistyLuminescence
396b2c78e7 Removes bad meme from hairstyle code 2017-11-06 14:38:37 +00:00
Screemonster
29f6c444c9 hunger feral tweak 2017-11-06 10:09:47 +00:00
Anewbe
c79cca6686 Merge pull request #4219 from Atermonera/AI_langs 
Ai langs
 2017-11-05 19:58:28 -06:00
Neerti
53bd641271 Merge pull request #4208 from Anewbe/more_event_manager 
Cleans up some Event Manager code
 2017-11-05 17:11:30 -05:00
killer653
2d51b8421d Emergency bugfixes 2017-11-05 00:52:06 -04:00
killer653
d8ca321b0b Reverts removed stuff from earlier pol sync. 2017-11-05 00:19:00 -04:00
Atermonera
b39d38f933 AI get local rootspeak 2017-11-04 21:01:11 -07:00
killer653
95f2ca3a0c POLARIS SYNC PART 2: 
I'm not a masochist, verk. Stop giving me extra work!
 2017-11-04 21:14:30 -04:00
Anewbe
2dfb3de415 Revert "Converts colorable species into the combo blend mode." 2017-11-04 15:47:32 -05:00