Commit Graph

15989 Commits

Author SHA1 Message Date
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
Mandurrrh 7865f56b1a Merge remote-tracking branch 'remotes/Upstream/master' into ghostpda
Conflicts:
	code/__DEFINES/preferences.dm
2015-03-02 11:46:07 -05: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
Swag McYolosteinen 969b301930 Merge pull request #8028 from Cheridan/foam_hose
Fixes metal foam dispenser mode for atmos backpack tank.
2015-03-02 16:47:29 +01:00
MrStonedOne cd75ad8693 Fixes admin alert for event triggering logic
Forgot to have it check the event's config in the second loop
2015-03-02 07:24:45 -08: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 1ef6cf1229 Merge pull request #8061 from Jordie0608/thisisindicativeofalargerrechargerconspiracy
Fixes #8052 Cyborg recharger density
2015-03-02 08:37:27 -06:00
Cheridan 00be838acc Merge pull request #8011 from Jordie0608/CMOSisforscrubskeepyourcomputerclocksavedinRAM
Server time for status panel
2015-03-02 08:32:48 -06:00
Mandurrrh 43f1fc3fd6 Adds appropriate message for user and nearby mobs for being knocked off table. Also uses weaken instead of stun to physically knock the player over. 2015-03-02 08:07:52 -05: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
Swag McYolosteinen d6a9d8cb8d Merge pull request #8084 from Incoming5643/you_just_got_mulliganed_on
Mulligan Round Fixes/Feature Requests
2015-03-02 10:56:24 +01:00
Cheridan 8d9d45131b Merge pull request #8004 from GunHog/RemovesXenoFunFromExperimentor
Replaces Xenomicrobes with Sulfuric Acid
2015-03-02 01:12:56 -06:00
Cheridan 960d3deeb0 Merge pull request #8023 from Jordie0608/youruniquenesswillbeassimilatedandthenturnedbrown
Fixes #7086 Job selection window width
2015-03-02 01:09:22 -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 78631a6958 Merge pull request #8038 from paprka/oopsjetpacks
fixes jetpacks as internals
2015-03-02 00:50:24 -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 fea3bb371f Merge branch 'master' of https://github.com/tgstation/-tg-station into loot_ops 2015-03-01 23:56:46 -06:00
Cheridan a9449f674d Nuke Op Hardsuit Refactor 2015-03-01 23:51:30 -06:00
Incoming 99431757eb Adds a lull between when the antagonist eats it and when the new antagonists are created: 3 ~ 7 minutes (5 average) 2015-03-02 00:24:25 -05:00
Ikarrus 15c10dd427 Preserve Objectives when admin-removing antag status
Sometimes admins want to change someone's antag type or simply refresh their antag status to fix bugs, while still preserving their objectives.  Being forced to lose them makes these really frustrating to do!

Admins can still manually remove their objectives from the same window (Mind Window/Traitor Panel).
2015-03-01 21:08:14 -07: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
Cheridan 9f62e2c387 Merge pull request #8055 from xxalpha/xxmas
Removes Santa Hats from security wardrobe closets and the festivus pole from RD's office.
2015-03-01 20:04:52 -06:00
Mandurrrh 9013a8d0a2 Balancing out tableclimbing. 2015-03-01 20:53:22 -05: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
xxalpha 843ee71f1d Removed new zippos. Changed color list. 2015-03-01 22:27:27 +00: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
Incoming 0037d06cbf Fixes a pair of instances where AssignRole() was being called unsafely and shoved a hot spoonful of sanity in there.
Fixes #8086
2015-03-01 16:47:58 -05:00
Incoming5643 2ff6e8ff08 Always remember to port smartly 2015-03-01 16:09:51 -05:00
Swag McYolosteinen ba3b161572 Merge pull request #8043 from Mandurrrh/kelvingrammar
Fixes  #7935 correct use of Kelvin without degrees.
2015-03-01 20:55:22 +01:00
Xhuis eb745941c5 Adds the Coderbus and Adminbus bar signs 2015-03-01 12:44:11 -05:00
Incoming 79edc1ff88 Replaces the custom "how many people are dead?" check with the one used for survival rates on round end statitistics because, lets be honest here, we know that one works.
Shuffles some flags around that should hopefully prevent round_converted() from running more than once. It's not a huge crisis if it does because late join antag is self capping, but still, not intended behavoir!
2015-03-01 12:13:55 -05:00
MrStonedOne 74bd002183 Adds admin alert when random events fire
Not sure why it took this long for this to happened.
Will only trigger on random event firing, and not when an admin triggers an event to prevent unneeded duplicate messages
Also triggers for events triggered by the wizard summon events
Logs in the game log under the GAME: heading as well
2015-03-01 06:50:51 -08: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
Incoming 3404074a32 adds an admin message on round conversion provided it gets far enough to matter. It also reports the same if no antags are made, to stop the exotic threat of unintentional admin meta. 2015-03-01 00:18:17 -05:00
Razharas 245f661607 Merge pull request #7725 from Steelpoint/Derelict
[MAP] Derelict Update
2015-03-01 06:53:49 +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
Razharas 960cc8dff6 Merge pull request #8021 from RemieRichards/AltClick-PixelPlacement-InteractionFix
Table-Item Pixel Placement Improvements
2015-03-01 06:42:44 +03:00