Commit Graph

8370 Commits

Author SHA1 Message Date
Cheridan
2be30eb89e Merge pull request #8083 from Delimusca/getochemboyz
added improvised heating
2015-03-02 08:58:12 -06:00
Cheridan
00be838acc Merge pull request #8011 from Jordie0608/CMOSisforscrubskeepyourcomputerclocksavedinRAM
Server time for status panel
2015-03-02 08:32:48 -06:00
phil235
d856e240c2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
Conflicts:
	icons/mob/head.dmi
2015-03-02 13:45:15 +01:00
Swag McYolosteinen
7c0e24f692 Merge pull request #7454 from Iamgoofball/patch-24
Makes water wash colorful reagent off too
2015-03-02 13:28:26 +01:00
Cheridan
6ca5a89025 Merge pull request #8036 from paprka/fixfueltank
Fixes practice lasers exploding fuel tanks
2015-03-02 05:54:09 -06:00
Cheridan
8d9d45131b Merge pull request #8004 from GunHog/RemovesXenoFunFromExperimentor
Replaces Xenomicrobes with Sulfuric Acid
2015-03-02 01:12:56 -06:00
Cheridan
6e68c4cb67 Merge pull request #8030 from Iamgoofball/patch-37
Nerfs Beepsky Smash (rip in peace)
2015-03-02 01:00:28 -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
Cheridan
90aabb4a67 Merge pull request #8077 from Iamgoofball/patch-39
Buffs Oxygen Blob and Radblob
2015-03-02 00:45:23 -06:00
Cheridan
73658a8c0b Updates SSU, Reprices Explosive Implants 2015-03-02 00:09:37 -06:00
Cheridan
a9449f674d Nuke Op Hardsuit Refactor 2015-03-01 23:51:30 -06:00
Ikarrus
e974d10058 Chatlog notification of changelog updates 2015-03-01 20:56:38 -07:00
Ikarrus
f95ca85ed6 Age Restrictions for Antagonists
Default minimum age is 7 days.
Team Antag modes and wizard is 14 days.
Malf minimum is 30 days (Same as AI minimum age).
2015-03-01 20:40:04 -07: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
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
Delimusca
747ebbc78d added improvised heating 2015-02-28 20:51:39 -07: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
Remie Richards
90a2385c41 Merge pull request #8049 from TheVekter/shotglassfixv3
Re-adds the shot glass sprites
2015-03-01 01:47:12 +00:00
Remie Richards
736ffafa55 Merge branch 'master' of https://github.com/tgstation/-tg-station into BlobReroll
Conflicts:
	code/game/gamemodes/blob/blobs/blob_mobs.dm
	code/game/gamemodes/blob/blobs/core.dm
2015-03-01 00:18:19 +00:00
Iamgoofball
86fa3c113c Buffs Oxygen Blob 2015-02-28 15:49:23 -08: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
Remie Richards
679c63a8ea Merge pull request #7924 from Incoming5643/mulligan_rounds
Mulligan Rounds for Wizard/Blob/Malf
2015-02-28 21:27:18 +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
Remie Richards
8cee97f54f Merge pull request #7942 from dannno/nothingmatters
THE OWL RETURNS
2015-02-28 16:06:35 +00:00
danno "big fucking moron" gonzales
49fc3d290c move alt_desc to obj/item/clothing 2015-02-28 11:02:58 -05:00
paprka
862c66ac63 rebalances thermals 2015-02-28 05:12:27 -08:00
Razharas
926c2f7413 Merge pull request #8027 from Iamgoofball/patch-36
I apparently added morphine to Deus. This was not intended.
2015-02-28 07:00:27 +03:00
Razharas
1b866bad83 Merge pull request #8024 from Iamgoofball/patch-35
Fixes the meth recipe
2015-02-28 06:59:56 +03:00
TheVekter
f6e18e9e45 Re-adds the shot glass sprites. 2015-02-27 17:14:50 -06:00
xxalpha
f9ebb2cff7 Merge remote-tracking branch 'upstream/master' into traymesons
Conflicts:
	code/modules/research/designs.dm
	icons/mob/eyes.dmi
	icons/obj/clothing/glasses.dmi
2015-02-27 21:15:01 +00:00
dannno
027eccedbc conflicts fixed 2015-02-27 14:01:42 -05:00
phil235
fa0e5344ef Removes sugar effects. 2015-02-27 19:01:32 +01:00
Razharas
b233b54cab Merge pull request #8006 from MrStonedOne/SomeThingThatEndsInYFollowedByTwoNumbers
Panic bunker + new player notification configs
2015-02-27 16:17:20 +03:00
Razharas
e0aa321ca0 Merge pull request #8037 from paprka/blackchowder
Fixes dark matter server crashing, retools dark matter to be less bad
2015-02-27 15:30:17 +03:00
paprka
8807c433ae modifies dark matter 2015-02-27 04:21:56 -08:00
paprka
5938cc7325 fixes practice lasers exploding fuel tanks 2015-02-27 03:58:25 -08:00
Razharas
12e4047cbe Merge pull request #7988 from Menshin/protalathe_matcheck_fix
Fixes protolathe incorrectly checking material amount
2015-02-27 11:11:52 +03:00
Razharas
78e504f33e Merge pull request #7994 from Incoming5643/colormesurprised
Fixes podmen always being sickenly off white upon creation
2015-02-27 11:10:55 +03:00
Razharas
a8cedc14ef Merge pull request #7969 from optimumtact/nanouibeginnings
Auto load required nanoui files on client login
2015-02-27 10:36:13 +03:00
Iamgoofball
081b957a48 Nerfs Beepsky Smash 2015-02-26 20:52:31 -08:00
Iamgoofball
16f319bffd I apparently added morphine to Deus. This was not intended. 2015-02-26 20:27:14 -08:00
Iamgoofball
7a990a0a28 Fixes the meth recipe
phosphorus
2015-02-26 18:22:22 -08:00
MrStonedOne
cf5d5794c7 Adds failed login message for panic bunker. 2015-02-26 16:54:20 -08:00