Commit Graph

9626 Commits

Author SHA1 Message Date
Spades 020d760ede Merge pull request #4294 from VOREStation/aro-proteandrop
Proteans drop items when blob
2018-10-01 09:31:14 -04:00
Spades ac85199b6b Merge pull request #4293 from VOREStation/aro-nifgibdrop
Drop NIFs when gibbed
2018-10-01 09:29:29 -04:00
Spades d68b641d6b Merge pull request #4287 from Verkister/smallvoreqol
Small qol tweaks for contamination and sleeperguts.
2018-10-01 09:29:08 -04:00
Spades 93dde92e42 Merge pull request #4283 from VOREStation/upstream-merge-5605
[MIRROR] Species item slowdown changes
2018-10-01 09:24:54 -04:00
Spades e795040d68 Merge pull request #4244 from Verkister/patch-23
Fixes curious rat getting stuck spammily.
2018-10-01 09:24:02 -04:00
Spades c6acdd5fe9 Merge pull request #4234 from Novacat/nova-heterochromia
Tactical Kittens
2018-10-01 08:49:19 -04:00
Spades 852eae3092 Merge pull request #4208 from lbnesquik/master
Minor dogborgs quality of life update
2018-10-01 08:47:25 -04:00
Spades b8f240f199 Merge pull request #4282 from VOREStation/sync-09272018
Polaris Sync 09-27-2018
2018-10-01 08:43:03 -04:00
Arokha Sieyes 8b7579ee1b Proteans drop items when blob
Bit of a rebalance on their blobbyness.

They drop most of their inventory when they blob. They keep: uniform, pockets, id, ears, nif but not other implants. Everything in that list but uniform can only hold small or tiny items.
Uniforms are stripped of accessories, so you can't sneak stuff in webbings or holsters.
2018-09-30 23:30:30 -04:00
Arokha Sieyes 29d4a3b80c Drop NIFs when gibbed
And when you die as a promethean (which always gibs you) cus Cheri is a whiner
2018-09-30 22:44:26 -04:00
Aronai Sieyes 08c3550f3a Merge pull request #4286 from VOREStation/aro-proteanmsg
Dumb typo on protean messages
2018-09-30 17:47:49 -04:00
Verkister 7a148f2a9d Small qol tweaks for contamination and sleeperguts.
-Removed the toxicity of gurgled items. (Planning to make them affect the user's examine flavor when equipped though.)
-Removed the silly animation on mess overlay. (possible remake later with extra flavors etc)
-Fixed sleeperbellies not suppressing injury emotes and deathmessages during digestion.
-Ruled out the possibility of the sleeperbellies breaking over defined "patient" going "missing".
2018-09-29 16:07:22 +03:00
Arokha Sieyes fed4b51b39 Dumb typo on protean messages 2018-09-28 23:11:57 -04:00
Spades e37ac96b25 Merge pull request #4176 from iskawhiskers/master
Add "monster mouth" and "blank round face" sprites to body markings
2018-09-27 19:36:22 -04:00
Atermonera e49090ecac Merge pull request #5605 from Anewbe/species_tweaks
Species item slowdown changes
2018-09-27 18:28:58 -04:00
Arokha Sieyes b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
2018-09-27 18:01:09 -04:00
Anewbe a5b26786ad Pose now shows up under descriptors 2018-09-24 18:42:03 -05:00
Anewbe 3f9896b0b5 Merge pull request #5590 from Mechoid/Statue_Stupidity
Make the Statue 'better'.
2018-09-24 16:07:57 -05:00
Mechoid 28d4f39aff Be Smart about damage things. 2018-09-22 17:59:24 -07:00
Mechoid 86504d1e4d Make the Statue NOT entirely immortal. 2018-09-22 01:11:38 -07:00
Anewbe c75741545a Descriptors now properly respect species differences 2018-09-20 19:30:25 -05:00
Atermonera c8dc627af4 Merge pull request #5573 from Mechoid/Blob2_Revenge_Of_The_Blob
More Blob modularity / Event-Manager compatability, Nests.
2018-09-18 11:11:51 -07:00
Atermonera f2ac15be91 Merge pull request #5511 from Anewbe/descriptors
Ports character physical descriptors from Bay
2018-09-17 11:21:28 -07:00
Mechoid 4fb5455fd3 Makes Blobs more useful. 2018-09-16 22:12:17 -07:00
Verkister b0c42682df Fixes curious rat getting stuck spammily. 2018-09-15 00:31:41 +03:00
Spades 22acaf3fcd Merge pull request #4092 from VOREStation/upstream-merge-5443
[MIRROR] Two pAI fixes
2018-09-10 12:32:59 -04:00
Unknown 40a8a93550 Tactical Kittens
- Adds Ascian's Kitten flavor item
- Changes normal kitten's inventory size, tactical kittens for everyone!

https://forum.vore-station.net/viewtopic.php?f=27&t=1425

Ascian's kitten sprites are very placeholder right now, in the future I will probably try to get a unique sprite.
2018-09-10 11:57:28 -04:00
Spades c5772cf6a0 Update pai.dm 2018-09-10 07:04:03 -04:00
Spades e51a5f18b5 Update pai.dm 2018-09-10 07:03:30 -04:00
Spades 4135792153 Merge pull request #3941 from Verkister/botmount
Adds dogborg riding.
2018-09-09 17:56:13 -04:00
Atermonera 40a8a9ba15 Merge pull request #5550 from Anewbe/helmet_hair
Helmets now show only certain hairstyles
2018-09-08 11:02:20 -07:00
Cerebulon d2cf9c7203 Adds new set of cyborg sprites for medical/science/default/security/combat (#5546) 2018-09-08 11:01:35 -07:00
Heroman3003 ae6c668a9d re-added Shellguard Noble sprites (by Travelling Merchant) 2018-09-08 21:24:10 +10:00
Atermonera 7c519f44ed Merge pull request #5514 from TravellingMerchant/master
Removes Shellguard Noble cyborg sprites.
2018-09-06 20:52:54 -04:00
Atermonera 953221d5b0 Merge pull request #5514 from TravellingMerchant/master
Removes Shellguard Noble cyborg sprites.
2018-09-06 17:52:00 -07:00
Anewbe b109cfae42 Helmets now show only certain hairstyles 2018-09-05 19:43:24 -05:00
Neerti a30a235de5 Merge pull request #5545 from Anewbe/another_boxfort_falls
Buffs the Vox
2018-09-05 15:55:29 -04:00
Anewbe 8c5562b4bc Fixes some bugs tangentially related to Vox code 2018-09-04 21:36:12 -05:00
Spades 35f3e81ca3 Merge pull request #3940 from Verkister/buttmount
Reworks taur riding system.
2018-09-01 17:25:23 -04:00
Atermonera d5de4651be Merge pull request #5539 from Anewbe/error_runtime
Might fix the server startup error_handler runtime
2018-08-31 22:56:52 -07:00
Atermonera a5fdbb6458 Merge pull request #5526 from Anewbe/throwing
Catching is no longer guaranteed, accuracy code is more general
2018-08-31 01:39:58 -07:00
lbnesquik d17d19aa74 Dogborg QoL 2018-08-31 08:01:26 +02:00
lbnesquik 23b3745266 Minor dogborg typo 2018-08-31 06:29:28 +02:00
Anewbe 3c8313650f Might fix the server startup error_handler runtime 2018-08-30 22:59:15 -05:00
Mechoid 7abeee54a0 Cult heal modifier no longer does Shit-Tons of agony. Does mediocre agony on non-cultists. 2018-08-28 21:40:41 -07:00
Anewbe b5e9000e11 Catching is no longer guaranteed, accuracy code is more general 2018-08-27 22:37:53 -05:00
Anewbe 9d8a19ab5d Cleave changes, attack code cleanup 2018-08-27 01:18:49 -05:00
Atermonera de65c3c643 NanoUI now processes again 2018-08-25 21:13:16 -07:00
Atermonera f776cc0513 Merge pull request #5517 from Anewbe/hud_invis
Low alpha now makes HUDs and tooltips not show up on you
2018-08-24 15:47:22 -07:00
Anewbe e8c9a44fbc Low alpha now makes HUDs and tooltips not show up on you 2018-08-22 18:00:10 -05:00