Commit Graph

4133 Commits

Author SHA1 Message Date
Incoming5643 febd47c6d6 byond inline spell checker fucking when 2015-03-06 15:20:56 -05: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
Cheridan d5ec11b91c Merge pull request #8080 from Incoming5643/Appearance_fix
Tweaks and fixes for the appearance window
2015-03-06 12:20:24 -06: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
Incoming 546c5eedc4 if you have AI or cyborg set to high, you'll see that in the preview window instead of a nondescript naked human 2015-03-05 14:23:19 -05:00
Miauw 82bc75c263 Moves chat toggles into their own variable. 2015-03-05 18:38:07 +01: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
Iamgoofball 15bc4760a7 fixes 2015-03-03 21:46:38 -08:00
Iamgoofball b98c5584df NEWCRIT + other changes 2015-03-03 21:35:30 -08:00
Incoming 6de8b0bd0c Enforces :3 on docile slimes, gives newly sentient creatures some direction on not wasting their creators, and fixes spelling errors 2015-03-03 17:12:46 -05: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
Incoming5643 f5e1b851dc Updating from the git web interface is a bad idea, you shouldn't do it! 2015-03-03 15:50:40 -05:00
Remie Richards 2d70141cd8 Allows admins (or coders if worn icons go the way of inhands) to specify an alternate file to load worn states from. 2015-03-03 20:23:26 +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
Iamgoofball 3964cb3126 Adds heart attacks properly. 2015-03-02 20:50:48 -08:00
Incoming5643 95ee4a7d43 Sanity check 2015-03-02 22:47:53 -05: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 00be838acc Merge pull request #8011 from Jordie0608/CMOSisforscrubskeepyourcomputerclocksavedinRAM
Server time for status panel
2015-03-02 08:32:48 -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
Incoming 4f44282664 Adds a free pass to assistants for player accounts younger than two weeks. 2015-03-01 17:15:25 -05:00
Remie Richards 14d5b559c7 Merge pull request #8072 from MrStonedOne/isee-saidtheblindman
Fixes #772 Toggling darkness off prevents ghosts from seeing one another
2015-03-01 22:01:35 +00:00
MrStonedOne 64851a016f Adds blob overmind cursor mob to ghost darkness vision
Thanks @Ricotez

Also tweaks the wording of related verbs, procs, and variables to match

Moves the scope of the ghostimages (now ghost darkness images) var and updatedateallghostimages proc to the global space so other things can access them
2015-03-01 04:07:10 -08:00
Razharas e505acf591 Merge pull request #7985 from Jordie0608/tgstationisaparadiseforlumberjacks
Cleanup of changelog related files
2015-03-01 13:20:33 +03:00
Razharas 111cb2a009 Merge pull request #8018 from phil235/BugFixA
A bundle of fixes
2015-03-01 06:44:02 +03:00
Incoming 8d831760ee Tweaks and fixes for the apperence window:
Fixes an unreported bug where all the lizardpeople were horrifying on the character preview because it wasn't rendering their tains and noses. Incidentally the proc for character previews is horrifying.

Only relevent appearence settings will appear on the appearence screen for each race.

Moves the skin tones selector to the relevent appearence settings area for humans.
2015-02-28 21:37:02 -05:00
MrStonedOne a26839cde0 Adds a new ghost verb to toggle ghost visibility
For users who depended on the old buggy version of see darkness.

reworks seedarkness logic to mash well with the new verb, looks nicer too
2015-02-28 13:43:55 -08:00
Remie Richards 88cc21cb6d Merge pull request #7963 from Incoming5643/manage_ass
Updates Manage Job Slots to work with assistant slots
2015-02-28 21:28:44 +00:00
MrStonedOne ef95d03a13 fixes runtime when client disconnects while a ghost. 2015-02-28 13:16:04 -08:00
MrStonedOne ff1a0d3ecd Moves global var ghostimage over to a static var on ghosts 2015-02-28 10:35:20 -08:00
MrStonedOne 0257dbfc9a Fixes #772 Toggling darkness off prevents ghosts from seeing one another.
Abuses client.images to get around the issue with flat see_invisible scaling not allowing for both being able to see ghosts while not seeing darkness layers.
2015-02-28 10:12:16 -08: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
Iamgoofball b95f44f235 Loads of pyrotechnics changes 2015-02-27 21:16:10 -08:00
Remie Richards 5e9e6a0264 Embedded object removal added to revive() changeling revive and fleshmend 2015-02-27 17:57:22 +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
Remie Richards 1e8324c3c5 Exposes all embedding related multipliers as variables and definitions. Only items of throw_speed 4 or more can embed now, Explosions force their object to be thrown at 4, this throw_speed threshold is ON TOP of needing to be a can_embed() object. 2015-02-26 17:04:00 +00: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
Jordie0608 4f160e4833 server time for status panel 2015-02-26 20:15:15 +11: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
hornygranny f0f509bc0b Merge pull request #7951 from Incoming5643/max_min_same_thing
population cap hotfix
2015-02-25 19:53:18 -08:00
hornygranny 3a762600b1 Merge pull request #7958 from phil235/RestrainedMessageSpamFix
Fixes restrained message spam by giving it a cooldown.
2015-02-25 19:52:49 -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