Commit Graph

124 Commits

Author SHA1 Message Date
Jordie a86b757d93 Merge pull request #8291 from Xhuis/nerf_thermal_vision
Nerfs changeling augmented eyesight
2015-03-26 13:01:25 +11:00
Xhuis 7f6871c233 Fixes conflicts and commits 2015-03-21 12:47:25 -04:00
Swag McYolosteinen e9f21c3b28 Merge pull request #8462 from xxalpha/cyberimplants
Cyber Implants Addendum
2015-03-21 13:38:27 +01:00
xxalpha 3888013a43 Changed flag list to flag var. 2015-03-21 12:24:27 +00:00
Swag McYolosteinen afa1b76cde Merge pull request #8190 from xxalpha/cyberimplants
Cybernetic Implants
2015-03-21 13:19:26 +01:00
xxalpha 31de411a11 Merge remote-tracking branch 'upstream/master' into cyberimplants
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/mob_defines.dm
2015-03-18 20:11:51 +00:00
Miauw 1873143e63 Initial say cleanup commit. 2015-03-18 19:23:31 +01:00
MrPerson 9038fb15af Code cleanup
Removed a bunch of unused or hardly used vars on /mob and /atom/movable.
Added defines for mob/living/var/mob_size so it's not using magic numbers.
2015-03-13 10:41:00 -07:00
xxalpha 0f01378e7a Reworked suggested code, added brain implants, misc additions.
Fix missing ')'.

DELETE THIS
2015-03-09 20:39:09 +00:00
xxalpha b1e340b19b Added X-ray implant, implant icon, touched up surgery. 2015-03-08 17:25:05 +00:00
xxalpha f0c3c9af07 Merge remote-tracking branch 'upstream/master' into cyberimplants 2015-03-06 18:52:25 +00:00
xxalpha 38bae63251 Added cybernetic implants and surgery. 2015-03-06 18:52:04 +00: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
dannno 54f1d333d7 Adds a slurring filter, replaces stutter filter where appropriate 2015-02-10 16:39:17 -05:00
Remie Richards 96ac837b65 Merge pull request #6960 from Iamgoofball/goonetics
Added 2 new powers and 9 new disabilities from goon and /vg/!
2015-01-19 17:47:33 +00:00
JJRcop f34afaa3c9 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChronOPS
Conflicts:
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/projectiles.dmi
2015-01-15 02:30:31 -05:00
Menshin 435ccf7ff9 * OOP'ed ear damages/deafness status updating
* Silicons are now immuned to ear damages/deafness
* Only living mobs can now take ear damages/be deafened
* Simple animals are now healing ear damages/deafness at the same rate as other living mobs
* Fixes being able to hear AI announcements when deaf
2015-01-13 00:40:46 +01:00
Iamgoofball b70fde1ed2 Fixes and Tweaks, adds mutations_say_mods() and say_mod() for mutations 2015-01-10 23:42:31 -08:00
Iamgoofball 39ede45b31 Added 2 new powers and 9 new disabilities! 2015-01-10 21:51:24 -08:00
JJRcop 539dac7308 Adds the Chronosuit
Sprites by spheretech
The chronosuit allows you to move via teleportation
Adds mob.remote_control var
2015-01-09 16:14:49 -05:00
tkdrg cdb5066502 Merge pull request #6324 from Razharas/GenShit
Added datum mutations
2014-12-31 17:24:15 -03:00
Perakp ee3617310e Merge remote-tracking branch 'upstream/master' into droneFix 2014-12-30 13:32:51 +02:00
Razharas 76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts
2014-12-28 11:20:15 +03:00
Cheridan cededeaa8e Merge pull request #6498 from as334/MobReactions
Allows chemical reactions inside mobs
2014-12-27 01:20:18 -06:00
as334 aef4ebc006 Allows chemical reactions inside mobs 2014-12-20 19:27:43 -05:00
Razharas f0c8f2eeac Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution
2014-12-16 02:52:08 +03:00
phil235 f87da5939a Making nutrition level values into defines.
Adding a changelog.
Snack vending machine's chef compartment is locked with kitchen access but can be emagged or hacked.
Adding feedback message for the user when its metabolism_efficiency changes.
Negative satiety can make you jitter a little bit at times. (probability linked to your satiety)
2014-12-13 17:15:35 +01:00
Razharas 11f6c7c401 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 2014-12-12 04:51:16 +03:00
Razharas 0921aa201f Added datum mutations
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03:00
phil235 7bd9b86652 Changes the hunger system in various ways. New hunger hud icons. Food w/o sugar can be loaded in snack vending machines by anyone. Adding two new var for mobs "satiety" and "metabolism efficiency". Rearranging datum/reagents, all "good" medical reagents are under datum/reagent/medicine/ and all food&drink reagents are under datum/reagent/consumable. Adding a pizza crate to cargo orders. Growns and cooked food are given vitamins while junk food are all given sugar. Removed some unnecessary code in Chemistry-Reagents.dm .
high satiety+fed = higher metabolism_efficiency, lower if starving. Sugar digested drains satiety and vitamin raises satiety. Negative satiety means faster nutrition drop. Positive high satiety means lower chance to spread viruses. metabolism efficiency affect metabolization speed of healing and damaging reagents and the efficiency of bodytemp stabilization via calory use.
2014-12-11 20:46:27 +01:00
Perakp 7f357963bd - Fixes belts getting stuck in drone inventory. Fixes #5563.
- Gives drones the ability to interact with APCs and air alarms without requiring them to have an ID card. Fixes #5565.
- Drones have to be adjacent to the APC/alarm when using it, for balance.
2014-11-29 14:36:36 +02:00
paprka 2b0af7e288 UI improvements, health doll final
Merge branch 'master' of https://github.com/tgstation/-tg-station into injurydoll
2014-11-28 13:06:22 -08:00
tkdrg 3bb478f12f Includes antag HUDs in the datum hud overhaul
Makes hud_list associative, and introduces the /atom list hud_possible,
which lists all the possible hud images a certain atom can provide.

Replaces all the awful procs in the gamemodes with their new
/datum/atom_hud versions, which are much shorter, simpler and faster.
2014-11-20 15:43:51 -03:00
paprka 6d848f90fd final commit for now 2014-11-01 18:40:52 -07:00
paprka 651accb441 updates to health doll 2014-11-01 18:01:31 -07:00
paprka 911b643c77 initial commit 2014-11-01 17:35:50 -07:00
MrPerson ef6204656f Space movement rewrite to allow everything to drift
Removes a version of atom/movable/Move() that was in mob_movement.dm.
New proc called newtonian_move() that's called as a result of things like shooting a gun or spraying a fire extinguisher and as part of atom/movable/Move().
It pushes src if it's not under gravity and gives the object a chance to stop itself.
As a result, inertial_drift() is kill.
Moved Process_Spacemove() out to atom/movable. It does the same thing, it's called whenever a drift is attempted and stops the drift if it returns 1. Default check is to look for nearby lattices to make dragging shit around the station less annoying. Mobs still call it in Client/Move()
The mob version of Process_Spacemove() will shove non-anchored nearby objects out of the way if you try to move like that. For example if you're free-floating in space next to a closet and try to move right, the closet will drift off to the left.
Mechs call their occupant's version of Process_Spacemove() so mining with a mech isn't retarded. The pussy wagon does the same thing and thus no longer works like a jetpack. Will it be making a comeback?!?! (no)
Any move will attempt to keep dragging your pulled object, not just ones initiated by the client. Should make space wind a little less annoying. Was needed to make drifting not break your drags.
Mechs drift correctly without any special snowflake crap.
Spaceslipping is gone because fuck that shit
Space movement is now slow instead of fast. Having a jetpack helps go faster but even that's slower than current. Hopefully means nuke ops can see each other as they move to the station instead of losing sight of each other instantly. Having your hands full makes spacemovement even slower.
You can drift in office chairs and drag mobs in beds or the bed itself. Currently drifting diagonally while in an office chair is bugged and I need help to solve it. It winds up in cardinal movement instead of a diagonal one.
Changes up the jetpacking effects system to cause fewer errant ion trails but it's still awful code. In hindsight I shouldn't have bothered but here we go.
2014-10-25 23:19:46 -07:00
Remie Richards d9dd60418d Alien hunters can now leap, Hitting a mob stuns it, Hitting anything dense stuns the alien for a short time 2014-10-11 02:40:27 +01:00
Miauw e3c0b2fa43 AHAHAHAHAHAHHAHAHAHAHASDHHADFHEUAHGUIHGDGIJDOINGEIOKILLTHEMALL 2014-08-24 20:35:49 +02:00
Miauw 891546aa56 More work on saycode. 2014-08-05 16:02:21 +02:00
Ergovisavi ff17e36750 Changes faction to list and edits hostile mobs to use the list type faction, along with changing existing factions to match the new list type
Also changes trees and space bats to "hostile" faction because they were copypasta'd carp before that, as well as changing goats to "neutral" and attack_self 1 so that the great mining drone / goat wars end
2014-07-12 20:03:46 -07:00
Rockdtben a034e41f25 Removing TLE comment stamps and useless comments 2014-03-13 08:25:28 -05:00
MrPerson 48923f9ce5 Redo of jitteriness and dizziness.
Fixes #2923
2014-02-27 23:19:44 -08:00
Aranclanos e6c856e456 Merge pull request #2803 from Rockdtben/SyndCardDesc
Synd card desc
2014-02-23 13:46:10 -02:00
Perakp 965e7ad6d8 Merge to master
Conflicts in mob.dm
2014-02-18 23:59:59 +02:00
Rockdtben 455175c42e Meh looks like I Forgot to revert. 2014-02-15 10:50:22 -06:00
Perakp 7ca06565b5 Merge remote-tracking branch 'upstream/master' into spellsFromBodyToMind
Conflicts (Resolved):
	code/datums/spells/mind_transfer.dm
	code/game/gamemodes/wizard/artefact.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/projectile/change.dm
2014-02-14 20:57:11 +02:00
Rockdtben 5768a0d58e These variables aren't used anywhere in the code. Removed. 2014-02-13 10:12:35 -06:00
adrix89 5e7cbf0486 Fix to seer rune.
More clear comment
2014-01-19 13:40:03 +02:00
adrix89 7939e94137 Change cult see and drug checks for see_invisible 2014-01-18 15:17:15 +02:00