Commit Graph

9282 Commits

Author SHA1 Message Date
Arokha Sieyes
82b755bab8 Allow K9s to use the hailer and law emotes
Fixes #3447
2018-04-19 18:08:13 -04:00
Aronai Sieyes
35ec513b28 Merge pull request #3452 from VOREStation/aro-sync-04122018
Polaris Sync 04-12-2018
2018-04-18 14:04:27 -04:00
NeverKnowWhyThis
5c234b773a Teshari stuff (#3467)
* Teshari stuff

-Adds a head to belly colouration for Teshari body marking
-Adds a smaller feathered alternative body marking
-Adds a Teshari mohawk hairstyle
-Adds a second option for Teshari tai (colorable)
-Adds a snowflake tail for Schae Shooki
-Adds an option to have ears on a teshari

* Changed names

* Moved sprite to correct .dmi

* Moved tashari_fluffymohawk to it's correct location

* Removed old tag

* Name edits, fluff item removed until approved correctly

I wasn't aware of SCA's for tails, I'll have it go trough the process normally.

* Minor name edit

* Modified body_parts to correctly reflect sprite

* Namefix

* Modified sprites and code that called upon them

* More spritefixes, reworked colouring

* More minor tailtweaking

* More fixes, underfluff is now working, but still needs the sprite adjusted to fit properly

* Small feathers are showing up, but more sprite issues to fix

* Modified Mohawk to show up on the character, sprites still aren't being loaded correctly. And I don't understand why it's happening

* Fixed markings, mohawk more ear styles based of the original

* Minor edit to heel fluff
2018-04-18 13:57:31 -04:00
Leshana
b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
2018-04-15 14:19:36 -04:00
Arokha Sieyes
84bbfcc787 Fix infinite loop of metal usage due to mismatch in values 2018-04-14 12:20:50 -04:00
Arokha Sieyes
be50f394a6 Transforming to/from protean blob unbuckles riders 2018-04-14 11:12:46 -04:00
Arokha Sieyes
4d80cd8df5 Proteans unbuckle targets before blobbing them 2018-04-13 21:08:06 -04:00
Heroman3003
1ff2f26889 Fixed legcuffs checking for being handcuffed instead of legcuffed when put on 2018-04-13 05:00:18 +10:00
Aronai Sieyes
791b5a4155 Merge pull request #3387 from KasparoVy/small_raptor_big_problem
Fix Teshari Tail-hair Rendering
2018-04-12 12:03:58 -04:00
Aronai Sieyes
b46816f01d Merge pull request #3436 from Verkister/patch-13
Nerfs apex metabolism
2018-04-12 11:52:10 -04:00
Aronai Sieyes
8afd5cad9a Merge pull request #3441 from Verkister/rous
Adds giant rat voremob.
2018-04-12 11:51:29 -04:00
Aronai Sieyes
ae4c5a0d95 Merge pull request #3443 from VOREStation/aro-digestaddons
Adds 'mode addons' feature to bellies to replace several modes
2018-04-12 11:51:15 -04:00
Arokha Sieyes
474bb3c8c8 Couple more Protean fixes, + darksight
Fixes a blob transform check. Also they get a smidge of darksight (the minor trait). I'm sure they have expensive sensors, but giving them the taj darksight seems meh.
2018-04-11 20:55:54 -04:00
Arokha Sieyes
4c604fb8da Adds 'mode addons' to bellies to replace several modes 2018-04-11 19:22:20 -04:00
Verkister
14ad23f8e6 mouse 2018-04-11 22:34:44 +03:00
Aronai Sieyes
b427bca859 Merge pull request #3423 from Verkister/newvoreagain
Some vore tweaks. (new gurglemodes will hopefully be back in another PR)
2018-04-11 14:37:20 -04:00
Verkister
2dec2545e5 Adds giant rat voremob.
-Currently only available via pred crate/shenanigans.
-This dude is friends with regular mice but will gladly kick any other ass.
2018-04-11 20:44:53 +03:00
Aronai Sieyes
2f04ff30cb Merge pull request #3433 from VOREStation/aro-protwork
Fix another protean bug (resizing message)
2018-04-11 10:23:44 -04:00
Verkister
4d40702f3e Nerfs apex metabolism
Now it's like more consistent with the steps between other modes.
2018-04-11 09:08:39 +03:00
Arokha Sieyes
3776c21563 Fix another protean bug (resizing message) 2018-04-10 22:16:36 -04:00
KasparoVy
58251baa3a Fix Teshari Tail-hair Rendering
Add the '_s' suffix to the icon state in the tail hair stage of tail icon generation.
This fixes an issue where Teshari tail hair wasn't rendering.

Also amends the colouration (was necessary for this to work for us) since VOREStation uses multiplicative blending
2018-04-10 20:06:53 -04:00
Verkister
d8efac9cb0 dunno 2018-04-11 01:23:44 +03:00
Aronai Sieyes
dc7cefdd0d Merge pull request #3421 from VOREStation/aro-protwork
Some protean fixes (regen, size as blob, gender)
2018-04-10 18:19:32 -04:00
Arokha Sieyes
82c05428e1 Some protean fixes (regen, size as blob, gender) 2018-04-10 18:10:14 -04:00
Spades
24217b12a8 Merge pull request #3389 from Verkister/mobvors
Fixes resting and vore icon issues with mobs and silicons
2018-04-10 14:44:36 -04:00
Verkister
6b535efd27 Adds some new gurglemodes and other tweaks
-Adds numbing item friendly gurglemode.
-Adds item friendly strip digestion. (still soggy though)
-Adds strip absorption. (absorb naked victim, leave their stuff in gut)
-Makes absorption mute the drained absorbee's hunger noises if enabled.
-Makes draining and absorption speeds scale with gurgledamage settings.
-Also makes them affect borg charges.
-Disables item friendly gurgles completely ruining IDs, the likely most important item the prey wants spared when suggesting the mode. (still messy though)
-Makes borg sleeperbelly sounds use the new pref-respecting noise system.
-Adds a finisher gurgle and ding sound to finished self-clean cycle.
2018-04-10 10:00:35 +03:00
Anewbe
8c23ec4844 Merge pull request #5153 from Neerti/4/5/2018_tile_attacking
Adds Tile-based Attacks
2018-04-09 19:16:58 -05:00
Verkister
5e0ed0585f done 2018-04-09 23:40:20 +03:00
Leshana
98d5f62250 Merge pull request #3400 from VOREStation/polaris-sync-2018-04-04
Polaris Sync 2018-04-04
2018-04-09 13:28:19 -04:00
Arokha Sieyes
d67f433f22 Fixes #3344 - Holocarp set DM_HOLD when holodeck is safe 2018-04-08 22:00:10 -04:00
Leshana
e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04
# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
2018-04-06 15:40:06 -04:00
Aronai Sieyes
2f8063c560 Merge pull request #3380 from Ketrai/patch-8
Nerfs solargrub drain speed.
2018-04-06 15:34:44 -04:00
Ketrai
26d028a16f Update solargrub.dm 2018-04-06 11:40:26 +02:00
Verkister
04a6d1a4b0 more fixes etc 2018-04-06 10:48:38 +03:00
Neerti
4ac6d34235 Adds Tile-based Attacks
Adds ability to attack mobs by clicking their tile.
When someone clicks a tile with a weapon while off help intent, and if a mob is occupying that tile, the mob will be attacked as if they were clicked directly.
If more than one mob is on a tile, one is chosen randomly.
You cannot hit yourself by clicking your own tile.
Weapons with cleaving abilities will attempt a cleave on the tile clicked on, making it very easy to hit (simple) mobs with those weapons if near you.

Other changes.
Cleave proc can accept any atom now and not just a mob.
Also cleans up weapons deciding how they can cleave somewhat.
2018-04-05 13:28:05 -04:00
Verkister
3c7febaa45 Makes human examine not force lowercase
on named accessories.
2018-04-05 15:42:22 +03:00
Verkister
4a81fcf8d8 Fixes a bunch of simple animal vore icon issues. 2018-04-05 09:59:24 +03:00
Mechoid
57ab0e715b Constructs 2.0 - Living Stone (#5040)
* Construct Overhaul + Related Fixes/Tweaks
2018-04-04 23:45:00 -07:00
Atermonera
a6ebe9b44a Merge pull request #5145 from VOREStation/vs-port-3058
[PORT] Halve character-join lag
2018-04-04 17:38:31 -07:00
Leshana
8c3e41a705 Small fixes and ports discovered during merge. (#5138)
* POLARIS: No string compare for assistants

* POLARIS: Move these planes to more useful places

* POLARIS: Only spam ghosts with chat messages from things with real clients

* Fix small forgotten lines of text accidentally left out of VS syncs.

* Fix typo'd plane in lighting.dm and remove redundant definitions.
2018-04-04 17:35:15 -07:00
Arokha Sieyes
0e2f41ea86 More optimizations for character joins 2018-04-02 16:49:44 -04:00
Arokha Sieyes
a6cfbc4f42 Initial cleanup/changes 2018-04-02 16:36:04 -04:00
Ketrai
9cac16375a Nerfs solargrub drain speed.
Due to the lack of saturation in the moderate event container, solargrubs show up way too frequently, and changing the frequency doesn't help. The container has to pick. This change will just bump the drain speed down so severely, that if you kill one or two grubs, the station should barely feel the impact anymore. As opposed to having to kill 4/5 grubs on average.

Gradual nerfs seem logical, as grubs get more and mroe of a day-to-day experience, and most people know about them now. Time to stop the witch hunting for those annoying grubs :p
2018-04-02 12:19:26 +02:00
MarinaGryphon
6cb7d9a10c Fixes wallet-HUD interaction issues. (#5130)
* Fixes wallet-HUD interaction issues.

* Fixes HUDs, too. Forgot to commit this the first time. Also hopefully didn't change the map to examplemap.

* Fixes an indentation error.
2018-04-01 22:46:13 -05:00
Neerti
183a567db0 Merge pull request #5059 from Heroman3003/slime-behavior-fixes
Fixes and tweaks for slime behavior.
2018-03-31 23:35:24 -04:00
Atermonera
8b7fe2129a Merge pull request #5100 from Verkister/patch-10
Re-establishes existing foundations for human icon construction
2018-03-31 12:14:23 -07:00
Leshana
6756c5a483 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
# Conflicts:
#	.travis.yml
#	code/ATMOSPHERICS/components/unary/outlet_injector.dm
#	code/__defines/_planes+layers.dm
#	code/__defines/chemistry.dm
#	code/__defines/mobs.dm
#	code/_helpers/mobs.dm
#	code/_onclick/hud/robot.dm
#	code/game/area/areas.dm
#	code/game/machinery/computer/supply.dm
#	code/game/machinery/cryopod.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/devices/communicator/messaging.dm
#	code/game/sound.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin.dm
#	code/modules/client/preference_setup/occupation/occupation.dm
#	code/modules/events/event_container.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/language/language.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_powers.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species_shapeshift.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_powers.dm
#	code/modules/mob/living/say.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/logout.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/shuttles/shuttle.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/wildwest.dm
#	maps/southern_cross/items/clothing/sc_head.dm
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
2018-03-31 09:20:59 -04:00
Neerti
9ff18723f4 Merge pull request #5128 from Atermonera/pai_mani
Fixes #4951
2018-03-29 23:21:15 -04:00
Neerti
f5c331b142 Merge pull request #5127 from VOREStation/vplk-table-layer-fixes
Table Layering and Runtime Fixes
2018-03-29 23:20:57 -04:00
Atermonera
a54522751b Change of template 2018-03-29 18:16:04 -07:00