Commit Graph

12467 Commits

Author SHA1 Message Date
Jordie0608 e6e2ec2809 Readds changelog popup as a config option 2015-03-03 19:51:35 +11:00
Razharas 665afe10e1 Merge pull request #8104 from Ikarrus/changelognotify
Chatlog notification of changelog updates
2015-03-03 10:36:57 +03: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
Razharas a07f6e6bfa Merge pull request #8103 from Ikarrus/antag_babbies
Age Restrictions for Antagonists
2015-03-03 09:02:52 +03:00
Ikarrus e85e010bd4 Cleanup: Removed an unnecessary comma 2015-03-02 22:37:27 -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
Ikarrus de362eabc9 Fixing type in index comments 2015-03-02 17:43:45 -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
hornygranny 539d51fb57 Merge pull request #8091 from MrStonedOne/whydidthistakesolong
Adds admin alert when random events fire
2015-03-02 12:02:43 -08:00
Swag McYolosteinen 4272ada464 Merge pull request #8042 from Mandurrrh/ghostpda
Adds the ability to see pda messages in Deadchat
2015-03-02 19:56:28 +01:00
phil235 d2d0888432 Merge pull request #7726 from xxalpha/traymesons
Mesons+T-Ray = Engineering Goggles
2015-03-02 19:24:06 +01:00
xxalpha c063665a84 Remove unnecessary check. 2015-03-02 18:15:51 +00:00
xxalpha fd958372a3 Fixed a bug. 2015-03-02 17:41:59 +00:00
Mandurrrh cde9de9e85 merge commits 2015-03-02 12:40:16 -05:00
xxalpha 42dd431e6f Removed duplicate code.
Removed more duplicate code.
2015-03-02 17:24:40 +00:00
Swag McYolosteinen daffcdf075 Merge pull request #7987 from phil235/SugarSatietyRemoval
Remove sugar satiety effect
2015-03-02 18:17:40 +01:00
Ikarrus 5341a48a86 span classes 2015-03-02 09:19:00 -07:00
Mandurrrh da6d3fc2cd Creates a separate toggle for ghosts to see pda messages! 2015-03-02 10:57:25 -05:00
MrStonedOne a3076ce0eb Admin event alerts can now be disabled per event.
Disabled for electrical overload and space dust.
2015-03-02 07:20:23 -08:00
Cheridan d218256e32 Merge pull request #7854 from phil235/LifeProcsDuplicateFix
Life procs duplicate fix
2015-03-02 09:16:09 -06:00
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
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
Iamgoofball 01b733b2a2 changes and tweaks 2015-02-28 22:13:11 -08: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
Iamgoofball 4bf99e2f0a cap. doesn't work, rip 2015-02-28 14:08:25 -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