Commit Graph

3190 Commits

Author SHA1 Message Date
Remie Richards
643de0c922 Hostile mobs no longer run all their hostile targeting/hunting code if there is nobody (or item, for those that hunt items) near them, they simply move to a simpler loop that decides whether to let the main loop continue. 2015-03-07 18:46:02 +00:00
Remie Richards
04dcfaddcf Merge pull request #8135 from Miauw62/adminjumpfixes
Fixes adminjump being dumb.
2015-03-07 18:17:41 +00:00
Miauw
f84f6aafcd Fixes adminjump being dumb. 2015-03-07 19:00:48 +01:00
Cheridan
9cf4a0bfc6 Merge pull request #8114 from phil235/CookTrash
Cooking fixes for meat and trash
2015-03-05 23:54:29 -06:00
Cheridan
07676b352d Merge pull request #8128 from Ikarrus/gangfixup
Makes Gang mode functional again
2015-03-05 21:11:59 -06:00
Cheridan
f68fd02d26 Merge pull request #8101 from MrPerson/alert_alert_ur_a_faget
On screen alert system
2015-03-04 19:39:04 -06:00
Remie Richards
d36488e5a2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NecromanticStone
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	icons/obj/wizard.dmi
2015-03-03 20:58:38 +00:00
Ikarrus
4d25d10d91 Increased chance of deconversion when applyinb brute force to head. The more hurt they are, the more likely they are to deconvert. 2015-03-03 00:30:29 -07:00
Ikarrus
9b28452bfe Makes Gang mode functional again
I'm going on vacation soon so I thought I might as well bring this game mode back up to at least a minimally functional state before I go.

A lot of features (Gang membership visibility, conversion pens, weapons, deconversion methods) have been stripped out for now. I gave gang bosses uplinks in the meantime.

It's basically rev vs rev right now, but the victory conditions with the recallers are still there. I'll work on adding more stuff after I return from my vacation.
2015-03-02 23:46:46 -07:00
phil235
467e102b49 Fixes trash disappearing when washed in a sink.
Fixes waffle trash being named "waffles".
Replacing some stat/weakened/stunned checks with incapacitated()
Fixes meat cutlets and steak not including meat type in their name (e.g. raw corgi meat cutlet)
Harvesting meat from simple animals now takes time, has a sound, and can be done with any sharp item.
2015-03-03 00:07:08 +01:00
MrPerson
24dcf08b2e Merge branch 'master' of https://github.com/tgstation/-tg-station into alert_alert_ur_a_faget
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	icons/mob/screen_alien.dmi
2015-03-02 12:04:38 -08:00
Cheridan
d218256e32 Merge pull request #7854 from phil235/LifeProcsDuplicateFix
Life procs duplicate fix
2015-03-02 09:16:09 -06:00
Cheridan
e812f8a47b Merge pull request #7844 from RemieRichards/DroneUpdate20-02-2015
Drone Skins + Drone Organic Vision Modes
2015-03-02 00:56:12 -06:00
MrPerson
8ffbc1be14 On screen alert system
Replaces some of the hardcoded HUD icons defined at mob level with a pair of mob procs throw_alert() and clear_alert(). Alerts will appear on the top-right side of the screen.
You can shift-click alerts to get a description of what's wrong and sometimes a tip on how to solve the alert.

Alerts can be given a master, which overlays the master on top of a box and forwards clicks of the alert to that master. Getting buckled will put an alert of what you're buckled to, for example. If it's a chair, you just click the alert and you're unbuckled. The idea I'm shooting for is to replace resist entirely with this kind of stuff.

Making a new alert and using it is a little complicated. This explanation will suck, but this is simpler than I'm making it sound, I promise. Throw_alert() has 4 args, category, id, severity, and obj/new_master. If you don't supply an id, category will be used as id. Only 1 alert per category is allowed; any duplicate will be replaced. Additionally clear_alert() clears alerts by category. Id MUST match a type path of /obj/screen/alert/[id]. That type path is where the alert's name and desc come from. The icon_state of the alert will either be "template" if new_master is set or [id][severity] otherwise. new_master is totally optional.

Examples:
throw_alert("oxy") -- takes name/desc of obj/screen/alert/oxy, icon_state = "oxy" -- clear_alert("oxy")
throw_alert("nutrition","fat") -- takes name/desc of obj/screen/alert/fat, icon_state = "fat" -- clear_alert("nutrition")
throw_alert("nutrition","starving") -- takes name/desc of obj/screen/alert/starving, icon_state = "starving" -- clear_alert("nutrition")
throw_alert("temp","cold",1) -- takes name/desc of obj/screen/alert/cold, icon_state = "cold1" -- clear_alert("temp")
throw_alert("temp","cold",3) -- takes name/desc of obj/screen/alert/cold, icon_state = "cold3" -- clear_alert("temp")

If you pass a new_master, id is only used to get name/desc and still must match a path, but the icon_state is "template" and icon is from the mob's ui preference instead of icons/mob/screen_alert.dmi.

Several unused icons removed, like borg oxygen and temperature alerts. Also some icons were used but now are not and were removed, like the nutrition icon for being well-fed and cyborg charge icon for being fully charged.
2015-03-01 17:31:26 -08:00
Razharas
111cb2a009 Merge pull request #8018 from phil235/BugFixA
A bundle of fixes
2015-03-01 06:44:02 +03:00
Remie Richards
c4b78e37af Merge branch 'master' of https://github.com/tgstation/-tg-station into DroneUpdate20-02-2015
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/simple_animal/friendly/drone.dm
	icons/mob/head.dmi
2015-02-28 16:19:13 +00:00
phil235
7171cd252b Fixes no blood dna on Mulebot and its blood tracks.
Fixes putting buckled mobs onto morgue trays.
Fixes mob pixel offset when unbuckled from roller bed.
Fixes blood trail appearing when pulling a patient on a roller bed.
Fixes other minor stuff.
2015-02-26 19:31:55 +01:00
Swag McYolosteinen
c6866b0369 Merge pull request #7881 from paprka/sayycode
Bolded yelling and missing green span
2015-02-26 17:59:17 +01:00
phil235
a3aa6ff4bf Reworked slime/death() and slime/gib(). 2015-02-26 16:03:47 +01:00
Cheridan
2bf705deb8 Merge pull request #7884 from Incoming5643/layers4lizards
Added some layers so mutantrace sprites actually make sense
2015-02-26 01:47:40 -06:00
Cheridan
51dbce4607 Merge pull request #7982 from TZK13/Deathsquad-Corgi
Adds deathsquad corgis
2015-02-26 01:28:07 -06:00
hornygranny
f7342415c1 Merge pull request #7959 from phil235/AttackSelfTKFix
A bunch of fixes
2015-02-25 19:54:36 -08:00
phil235
18323955a7 Merge branch 'master' of https://github.com/tgstation/-tg-station into LifeProcsDuplicateFix
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2015-02-25 19:01:59 +01:00
TZK13
4e0ce8a452 Adds deathsquad corgis. 2015-02-25 01:16:17 -06:00
Razharas
588c79873f Merge pull request #7562 from Iamgoofball/drugs
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
2015-02-25 08:26:21 +03:00
Remie Richards
b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
hornygranny
84296b10fa Merge pull request #7930 from phil235/XenoPounceMessageFix
Fixes xeno pouncing messages being bold green for human viewers.
2015-02-24 10:12:03 -08:00
phil235
01720fc486 Adding a warning comment 2015-02-24 17:13:54 +01:00
Iamgoofball
722c4cb1ef re-adds GOTTAGOFAST, renames the current gottagofast to IGNORESLOWDOWN, adds GOTTAGOREALLYFAST for meth 2015-02-23 19:35:58 -08:00
Razharas
e889ee7a42 Merge pull request #7700 from RemieRichards/ExplosionsAndEmbedding
Items Embedding in Limbs
2015-02-24 01:22:01 +03:00
hornygranny
08fd5d5146 Merge pull request #7914 from paprka/jetpax
Fixes breathing from jetpacks
2015-02-23 12:59:49 -08:00
Swag McYolosteinen
984b7cb8f6 Merge pull request #7738 from Incoming5643/mediborg_inbuiltstretcher
Mediborg Improvement Drive: Roller Robo Da
2015-02-23 17:10:43 +01:00
phil235
8439310170 Fixes xeno pouncing messages being bold green for human viewers. 2015-02-23 14:09:16 +01:00
hornygranny
a5a7b590d3 Merge pull request #7866 from phil235/PullBuckleFix
Fixes being able to break free from a pull while handcuffed if the puller is buckled.
2015-02-22 20:18:54 -08:00
hornygranny
c0c8a739e2 Merge pull request #7721 from paprka/miening
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
paprka
b439b838d3 jetterpecks 2015-02-22 13:24:26 -08:00
paprka
e68a4027b2 double exclaimation points 2015-02-22 03:50:40 -08:00
Jordie0608
edcfae62d3 spellfix 2015-02-22 21:32:39 +11:00
Incoming
59547b56a5 Procs out the mutant bodyparts code more jucidiously so we don't have to call update_body every time you put a suit on.
Fixes a bitflag I missed that was causing some confusing behavoir
2015-02-21 21:07:05 -05:00
Incoming
6843562301 Added some layers to allow for accurate "3D" placement of otherwise obtrusive mob features like tails or weirdly shaped heads. In addition exosuits that hide the uniform will now also hide a lizards tail, and masks that hide the face will push a poor lizards nose in so we don't see it clipping out the front. of the damn thing. 2015-02-21 19:34:10 -05:00
Remie Richards
897df7999d Optimises a loop 2015-02-21 17:14:47 +00:00
Remie Richards
1d63720e4a Removes unnecessary resource hog, It's not even needed, I'm a derp. 2015-02-21 16:41:28 +00:00
Remie Richards
9efa69145d Fixes #7852, Drones now have 3 vision modes to choose from: Static, Blank (Black icons) and Rougelike colour lettering. 2015-02-21 15:41:45 +00:00
phil235
e9a943218c Fixes being able to break free from a pull while handcuffed if the puller is buckled.
Add the incapacitated proc to mobs to check for stat, stun, weakened, paralysis, restrained. And replacing those checks by that new proc in some places.
2015-02-21 14:49:47 +01:00
paprka
964544d16b bolded yelling and missing green span 2015-02-21 04:17:55 -08:00
phil235
a185281003 Merge branch 'master' of https://github.com/tgstation/-tg-station into LifeProcsDuplicateFix
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2015-02-21 00:37:53 +01:00
phil235
c8b0a21baa Fixes a lot of duplicated code in life and its subprocs for carbon mobs.
Fixes cyborg and monkeys no seeing any flash when flashed.
2015-02-21 00:37:04 +01:00
Cheridan
6d78f9b77d Merge pull request #7828 from Incoming5643/let_us_never_speak_of_this_again
Removes the unintended ability to have sex with cats
2015-02-20 13:18:46 -06:00
Remie Richards
8143aae66e Ensures Drones see Drones, Syndrones can now see mobs instead of static due to their evil programming. 2015-02-20 18:57:01 +00:00
Remie Richards
59c7c7968d Reorgansies Drones into multiple files. Drones now have 2 skins to choose from (With easier support for more). Drones now see static instead of other mobs (Except Drones) 2015-02-20 14:21:25 +00:00