Commit Graph

11418 Commits

Author SHA1 Message Date
DeAndre a9b1ada28c Merge branch 'master' into Somethingforthekids 2019-10-20 13:26:13 +02:00
ATH1909 d843abea27 Fixes milk (#47168)
* Update species.dm

* Update plasmamen.dm

* Update golems.dm

* Update skeletons.dm

* Update toxin_reagents.dm

* Update plasmamen.dm

* Update golems.dm

* Update skeletons.dm

* Update toxin_reagents.dm

* Update golems.dm

* Update plasmamen.dm

* Update skeletons.dm

* Update skeletons.dm

* Update golems.dm

* Update plasmamen.dm

* Update skeletons.dm

* Update golems.dm

* Update species.dm

* Update plasmamen.dm

* Update skeletons.dm

* Update golems.dm

* Update plasmamen.dm

* Update skeletons.dm

* Update plasmamen.dm

* Update skeletons.dm

* Update plasmamen.dm

* Update golems.dm

* Update skeletons.dm

* Update toxin_reagents.dm
2019-10-19 22:38:35 -04:00
spookydonut 4e8ff18b07 Fix Travis grep script to use PCRE to actually match things (#47065)
Several of the greps were missing the `-P` switch which caused them to 
fail to match things. The EOL grep also wasn't working right so I 
replaced it with the one I added to TGMC.
2019-10-19 10:21:05 -07:00
Yaki 46d57ae96a Skeletons Can No Longer Be Hugged By Facehuggers: Take 2 (#46959)
* creates the xeno immunity trait for skeletons

* creates globalvar for xeno immmunity

* gives skeletons the xeno immunity trait

* makes the hugger check for xeno immunity

* checks for xeno immunity trait over embryo and hivenode

* adds the xeno immunity trait with hivenode

* adds xeno immunity trait when impregnated

* whoops fixed the number of macro args

* okay NOW it should be fixed

* there now it should b gucci
2019-10-18 19:46:13 -04:00
nemvar b7cb636842 Fixes timer for lava warning (#47130) 2019-10-19 01:16:39 +02:00
Fox McCloud a8223c2ba3 Better Slime and Xenobiology Equipment Garbage Collection (#46961) 2019-10-17 19:01:48 -07:00
Emmett Gaines 8982f509b5 Refactors screen object update_icon to call parent (#47094)
* Refactors screen object update_icon to call parent

And makes update_icon an /atom proc

* Cleans up some missed null checks

The student teaches the master
2019-10-17 18:21:50 -07:00
TheChosenEvilOne 8605ae2142 Multi-Z improvements part 2 (#47097)
* MultiZ Improvements

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* RCD works on openspace now.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* I knew something like this would happen with rebasing.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Copy-Paste is gone!

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-10-17 11:02:40 +02:00
nemvar 39fead370a Removes the absolute istype fest from footsteps (#47030)
* Removes the absolute istype fest from footsteps

* Slightly switches some stuff around. No need for a special xeno proc

* Adds error catcher. Also adds footstep to dark wizzies

* Adds footsteps to sloths

* Brutally murders the initialize footstep proc.

* Footsteps to paperwizard

* Better yet?

* fixes fucky wucky

* Fixes the return value. Makes it easier to follow what's going on.

* flips around conditions

* Now supports strings.

* Moves autodoc
2019-10-16 10:24:41 -04:00
zxaber f034297567 rip ratvar (#47101) 2019-10-16 13:25:24 +02:00
KomradeSpectre 9ff071af60 Clockcult Removal 2019 (#47057)
* Nanotrasen fires the Wave Motion Gun at the Clock Cult

* Fixes a random changelog appearing from the reebe void.

* Fixes a wrong type reference regarding the bronze sheets in the Lavaland Ruin for it.

* Fixes redundant cells after CC removal in ruin by populating them with varied ore chunks, or destruction clutter.

* why is it /obj/item/stack/sheet/metal but not /obj/item/stack/sheet/iron

* Fixes the lavaland ratvar ruin to have fluff variant structures of deleted shit it referenced instead what I thought was reasonable.
2019-10-15 10:13:41 +02:00
Firecage 81ca3fb625 All dogs can now eat snacks and dance, including puppy Ian. (#46925)
* Changes the Ian puppy into an actual Ian puppy.

* Adds the unique_pet var to puppy Ian.

* All dogs can now eat snacks and dance.

* Moves the proc to its proper position in the file.
2019-10-14 00:33:23 -04:00
Fikou 31ab3ac830 power tool refactor (#46974)
Power tool refactor
2019-10-13 20:34:52 +02:00
skoglol b68abe7e6d Adds random character when antagonist preference (#46952)
About The Pull Request

Well known statics rejoice! You can now choose to have random name/body/age/gender whenever you roll roundstart antagonist.

Since player mobs are generated before antag datums are handed out, I added a list that collects minds chosen as antags during pre_setup() to keep track of this.

"Other" was also missing from the random gender, added it.

Wizard, clown op, nukeop, latejoin and midround antags are excempt.
Why It's Good For The Game

Some static namers get metagamed to the extreme when antagonists, this should help alleviate that while allowing them to keep static naming for the RP. Keep in mind all conversion, midround and latejoin antag rolls are excempt, this is not a guarantee someone is a non-antag.
Changelog

cl Skoglol
add: Random name/body/age/gender when roundstart antagonist preference added.
add: Random gender will now have a chance of picking "Other".
/cl
2019-10-13 17:00:17 +13:00
Iamgoofball 95ab416ce0 [s] fixes href exploit to early join the game before roundstart (#47029)
fixes href exploit to early join the game before roundstart
2019-10-13 16:46:11 +13:00
Couls ec1df6c7e7 fix some blindness issues (#47024)
About The Pull Request

fixes #47020 #47022
I didn't have a max set for the adjust_blindness proc which allowed it to go below zero which meant if you took eye healing chems it would actually make you blind forever, the issue with the wizard spell blinding you permanently was due to a check to see if duration was less than charge_max for genetic spells which was used for making mutate permanent, but also made the blindness spell permament
Why It's Good For The Game

Being blind forever can suck
Changelog

cl
fix: blindness spell now only blinds you temporarily
fix: drinking carrot juice no longer permanently blinds you
/cl
2019-10-13 16:45:47 +13:00
Fox McCloud 8056e320bb Fixes a Few Pacifism Bugs (#47006)
Just fixes a few pacifism issues.

Currently you can hurt people by punching them with a mech.

You can also hurt people by throwing them into a wall or into another mob.

Both have been addressed; mechs lacked a check, and throwing mobs lacked a return.

cl Fox McCloud
fix: Fixes being able to mech-punch other mobs, as a pacifist
fix: Fixes being able to hurt people, as a pacifist, by throwing them into a wall or other mob
/cl
2019-10-13 16:43:58 +13:00
YPOQ 5b17c75909 Allows admins to spawn multiple bubblegums (#46951)
Fixes #45799

This check was added as a workaround for a bug in the lavaland generation code that could cause multiple bubblegums to spawn. Since the bug was fixed in #46457, this check can be removed.
2019-10-13 16:41:40 +13:00
Fox McCloud dfb8438cd7 Fixes AI Swarmers Doing Nothing (#46939)
About The Pull Request

AI swarmers are supposed to go after nearly everything in sight, including turfs, but this behavior is broken; I wouldn't be all surprised if other mobs targeting behavior is also broken.

In an attempt to make bees perform better, ListTargets behavior was changed here: #31250

While it does, supposedly, perform better, it also breaks swarmers---andddd I suspect other mobs, as well, as this effectively means anything that's not a mob or an object (primarily turfs).

Either case, this reverts ListTargets back to what it originally was, restoring intended behavior.

That said, since bees are so problematic, they use the current ListTargets behavior to only search for objects and mobs.

fixes: #46938
Changelog

cl Fox McCloud
fix: Fixes AI swarmers just sitting in their base doing nothing
/cl
2019-10-13 16:39:57 +13:00
Arkatos1 5e47463792 Silicon PDA fix (#46922)
About The Pull Request

This PR makes it so that silicon PDA verbs like toggle ringer are given only to a silicons that actually have one, like AI or pAI. This is also consistent with other similiar silicon items, like silicon camera.
Why It's Good For The Game

Less bugs.
Changelog

cl Arkatos
fix: Only silicons with a valid PDA will now get PDA-related verbs.
/cl
2019-10-13 16:39:00 +13:00
Rob Bailey e1683f674f Merge pull request #46978 from willox/duplicate-variable-stuff
removed a bunch of duplicate member variable definitions and entirely duplicated types
2019-10-12 03:44:15 -07:00
loser b81b9f9bcd You're shoved onto the table by Talia Robinson! (#46997) 2019-10-10 14:05:50 -04:00
nemvar c38a7a3bb5 Removes a bunch of var/ in procs (#46946)
* Removes a bunch of /var in procs

* reset this

* Why wasn't this already?
2019-10-10 04:20:27 -07:00
Fikou e450be44dc surgery tool refactor (#46856)
* awooooooooooooooooo

* a

* aw shet

* woops!!

* a

* wow heck you
2019-10-09 12:25:42 -04:00
py01 b645de684e Mass purrbation affects mutant species (#46779)
* mass purrbation affects all species

* mass purrbation code cleanup

* remove mass purrbation gives mutant species their special ears and tails back

* mass purrbation syntax fix

* remove mass purrbation does not remove felinid from original felinids

* fuck you travis
2019-10-08 19:22:32 -04:00
William Wallace 59fb7d3a4a remove duplicate var definition in /mob/living/simple_animal/slime 2019-10-09 00:10:46 +01:00
William Wallace 6ea67b18f3 remove duplicate var definition in /mob/living/simple_animal/hostile/asteroid/goliath 2019-10-09 00:10:17 +01:00
William Wallace 7bd69f587b remove duplicate var definition in /mob/living/simple_animal/hostile/asteroid/basilisk 2019-10-09 00:08:54 +01:00
William Wallace 5c240c87f3 remove duplicate var definition in /mob/living/simple_animal/hostile/lightgeist 2019-10-09 00:07:15 +01:00
William Wallace 65ba24d4fb remove duplicate var definition in /mob/living/simple_animal/hostile/gorilla 2019-10-09 00:06:38 +01:00
William Wallace a133637cab remove duplicate var in /mob/living/simple_animal/hostile/asteroid/fugu 2019-10-09 00:05:41 +01:00
William Wallace 053b977885 remove duplicate var definition in /mob/living/simple_animal/hostile/tree 2019-10-09 00:02:22 +01:00
William Wallace 6643383305 remove duplicate var definition in /mob/living/simple_animal/hostile/netherworld 2019-10-08 23:57:58 +01:00
William Wallace b8f97ba926 remove duplicate var definition in /mob/living/simple_animal/hostile/poison/giant_spider 2019-10-08 23:56:16 +01:00
William Wallace d1486ae733 remove duplicate var definition in /mob/living/simple_animal/pet/penguin/emperor 2019-10-08 23:55:13 +01:00
William Wallace 174aa1d84c remove duplicate var definition in /mob/living/simple_animal/shade 2019-10-08 23:52:20 +01:00
William Wallace a59e8f2cf0 remove duplicate /datum/emote/silicon/chime definition 2019-10-08 23:48:47 +01:00
William Wallace c00d457482 remove duplicate /datum/sprite_accessory/hair/bun2 &/datum/sprite_accessory/hair/bun3 2019-10-08 23:48:04 +01:00
Qustinnus a394ccdc2b Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)

this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.

also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
oranges 4c0a8778be Merge pull request #46926 from kriskog/drones
Drones no longer delete dropped items
2019-10-08 11:42:47 +13:00
kingofkosmos 71644568b5 Personal interaction messages to simple animals (#46744)
* Adds attacktext2 and friendly2 messages for personal "you" messages in combat.

* Adds response_help2, response_disarm2 and response_harm2 -messages for interacting with simple animals. Also removes unnecessary, already inherited, ones.

* Small extra: Adds personal messages for gun firing.

* Adds personal messages to grabs and fixes shoe stealing messages.

* Fixes open someone else's internals valve pronoun.

* Replaces response_help --> response_help_continuous, response_help2 --> response_help_simple etc. Also adds autodoc to simple_animal.dm variables.
2019-10-07 21:18:42 +02:00
NikNakFlak 66f04e2ab8 PAI sunglasses can now be picked from the emote menu (#46929)
thanks oranges for the help
2019-10-07 11:31:22 +13:00
Kristian 781a3b4651 and simpleslimes 2019-10-06 22:54:24 +02:00
Kristian c6b666ebce Drones no longer delete dropped items. 2019-10-06 22:43:42 +02:00
Couls 67fe7e8951 refactor blindness code to have less copy paste (#46729)
* refactor blindness

* Update code/modules/mob/living/carbon/human/life.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* make blind_eyes call adjust_blindness

* cure blind trait upon death
2019-10-06 21:57:21 +02:00
Tlaltecuhtli 64a6bd0413 fire damage by rads is log(rads) * 2 (#46806)
* fire damage by rads is capped to 15/pulse

* use log

* e
2019-10-06 21:37:30 +02:00
nemvar a148cae769 Kills obj/item/projectile in favour of obj/projectile (#46692)
* Kills obj/item/projectile in favour of obj/projectile

* Resolves conflicts properly

* fixes that one map

* it lives
2019-10-06 13:37:24 -04:00
nemvar 59fea61731 Turns NOFLASH into a general trait instead of a species one (#46798)
About The Pull Request

Moves NOFLASH from species traits to inherent traits and renames it TRAIT_NOFLASH

Also moves the trait check to living level instead of carbon but that shouldn't cause any real issues it just expands the possible range of usefulness of this trait.
Why It's Good For The Game

From what I gathered, species_traits should be used for stuff that gets handled internally while inherent_traits is for used for stuff outside of the species datum.

This expands the possibilities in which this trait can be used and also kinda makes more sense if you ask me.
Changelog

backend boys.
2019-10-06 22:53:54 +13:00
skoglol 46b68598d3 Some KS13 improvements (#46879)
About The Pull Request

Having observed a bit of how people play the derelict drones after #45965, I got a few additions and changes to the derelict to make it more enjoyable.

    Power cable into the AI core/vault area was hard to find under an rwall, have run an additional one into the room to give easier access to pre-smes power.
    Added a derelict drone printer, so more friends can be printed. Starts without materials
    Added mother drone core lawset to secure storage. This was intended in the last PR, but forgotten.
    Added a dronespeak manual that drones can use to teach other drones or silicons the drone language. Works like the codespeak manual.

Why It's Good For The Game

KS13 is frequently made great again.
Changelog

cl Skoglol
tweak: Slight mapping improvement to KS13
add: KS13 now has mother drone board, a dronespeak granter and a drone printer.
/cl
2019-10-06 22:36:55 +13:00
carlarctg 62735814b1 nitrile and latex gloves reduce firefigher carry delay (#46735)
* hup

* they are CONFIDENT

* ok vsc

* its 25 now not 50

* compiled but not tested. i am lazy and its 12 pm

* actually this is clearer

* uh

* this is less bad

* Update color.dm

* C O B B Y

* quick fix

* i fucked these up!

* all bugs fixed. probably

* ok cobby

* hi
2019-10-06 01:47:52 -04:00