Commit Graph

8422 Commits

Author SHA1 Message Date
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
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
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
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
killer653
7a3bf3cd89 More edits 2017-11-04 13:45:26 -04:00
killer653
11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
Spades
8481082982 Merge pull request #2411 from Verkister/niftf
Makes species TF not destroy NIFs.
2017-11-04 13:07:43 -04:00
Spades
11038d20d5 Merge pull request #2406 from VOREStation/Cameron653-patch-1
Gives akula rip & tear
2017-11-04 13:07:02 -04:00
Spades
59b13ab098 Merge pull request #2387 from Cameron653/WING_FLIGHT
Allows flight with wings.
2017-11-04 13:06:52 -04:00
Verkister
f0818789a4 Makes species TF not destroy NIFs.
-Also affects to other means of species changes with organ list rebuilds.
2017-11-04 11:30:30 +02:00
killer653
42c8d39def Fixes issues 2017-11-03 18:23:20 -04:00
Anewbe
ae6583e5fb Cleans up some Event Manager code 2017-11-03 16:24:36 -05:00
Anewbe
0c6a93e38c Merge pull request #4203 from Verkister/loadandblend
Enables the combo blend mode for most colorable loadout gear.
2017-11-03 15:11:37 -05:00
Anewbe
fce9fe2c72 Merge pull request #4188 from Atermonera/VR_2
Virtual Reality
2017-11-03 15:10:53 -05:00
Cameron653
7de867d915 Gives akula rip & tear 2017-11-02 21:09:22 -04:00
Verkister
26ea6ec92d Enables the combo blend mode for most colorable loadout gear.
-The most meaning the colorable uniforms, suits, gloves, shoes, headgear, earwear, and accessories.
-Only affects mob icons for now, the inventory/floor icons still in old blend.
-Sort of a framework for possible additional options to come.
-Also messed around with some other stuff such as adding on-ear icons to the rest of the flower pins and bows, and made the base icons for the beanies lighter than the middle gray they were.
2017-11-02 15:33:52 +02:00
Atermonera
28e7426597 Hug gender (#4195)
* Revert "Update #3? 4?"

* Revert "Revert "Update #3? 4?""

* Hug doesn't reveal gender

* Wrong logic
2017-11-02 01:00:05 -05:00
Anewbe
6abe54c323 Merge pull request #4189 from Verkister/comboblendoo
Converts colorable species into the combo blend mode.
2017-11-01 22:18:47 -05:00
Neerti
df7c7ead5f Merge pull request #4182 from Anewbe/rerobust_simple_mobs
Adjusts simple mobs
2017-11-01 23:11:24 -04:00
Anewbe
67792ad5b5 Adds a necessary rand 2017-11-01 21:59:43 -05:00
Verkister
d36753c2fd almost forgot tesh had no separate deform sheet to convert 2017-11-01 09:45:27 +02:00
killer653
954d254f11 Makes the var on /mob, making it easier to porrt. 2017-10-31 19:08:45 -04:00
killer653
2c8043d33c Makes it cost 25 to hover. 2017-10-31 18:44:11 -04:00
killer653
17a19d1a1d Allows bumping into along w/ hovering 2017-10-31 18:39:58 -04:00
killer653
74b338bf2b Makes you glide while flying. 2017-10-31 17:18:38 -04:00
Verkister
45f53405fe Converts colorable species into the combo blend mode.
-Unathi, Tajaran, Skrell, and Teshari now use mult+add combo blending.
-As do their tails, tail anims, and extra tesh feathers.
-No issues detected on latest test runs.
2017-10-31 12:50:15 +02:00
Atermonera
64942bd04c VR Core 2017-10-30 22:32:36 -07:00
Anewbe
cc7ba41c34 Improves electrocute_act, adds ELECTROCUTE damage type 2017-10-30 22:00:25 -05:00
Anewbe
8d8052f486 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into rerobust_simple_mobs
# Conflicts:
#	code/modules/mob/living/simple_animal/simple_animal.dm
2017-10-30 21:32:14 -05:00
Neerti
318ccff1c9 Merge pull request #4177 from Anewbe/background
Ports the background icons for char setup
2017-10-30 20:35:55 -04:00
Neerti
156423f0a2 Merge pull request #4174 from Anewbe/simple_animal_attacks
Buffs simple mob hit chance
2017-10-30 20:35:21 -04:00
Cameron653
afb103838e Bumps trait up to 2 points. 2017-10-30 20:09:42 -04:00
killer653
cfb3b84087 Adds flight limit 2017-10-30 18:16:15 -04:00
killer653
fc5f6c084b Adds a limit to flying. 2017-10-30 18:12:17 -04:00
Verkister
1ba7a08339 Fixes borgs being unable to push past humans.
-Swap flags (for bumping in help intent) did not include humans for no given reason while still allowing other mobs and other way around interaction.
2017-10-30 21:17:59 +02:00