Commit Graph

9000 Commits

Author SHA1 Message Date
Cheridan 95e269e211 Merge pull request #8122 from Xhuis/miners_messiah
Adds the ore satchel of holding
2015-03-06 15:15:40 -06:00
Cheridan 377dd9f876 Merge pull request #8142 from phil235/girderfixes
Fixes many checks in construction from stacks,
2015-03-06 13:54:09 -06:00
hornygranny 68c791ee7c Merge pull request #7751 from RemieRichards/ProceduralGeneration
Procedural Map Generator System
2015-03-06 11:49:21 -08:00
hornygranny d61cf2b022 Merge pull request #8107 from Cheridan/loot_ops
Nuke Op Loot Pinata Tweaks
2015-03-06 11:48:07 -08:00
Cheridan 0496dcd446 Merge pull request #8169 from dannno/morebarsigns
adds more barsigns
2015-03-06 13:35:13 -06:00
Cheridan 92a40fc470 Merge pull request #8126 from Iamgoofball/raginmages
fixes Ragin' Mages making only 1 mage
2015-03-06 13:04:48 -06:00
Cheridan d56cb89407 Merge pull request #8076 from xxalpha/lighters
Grayscale Lighters
2015-03-06 00:00:51 -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 6b633c35d2 Merge pull request #8145 from Incoming5643/dangit_bobby_its_all_ones_and_zeros
Hotfix for Blob mulligan rounds not ending | Nuke codes being given in times of peace | AI desiring to blow up the station
2015-03-05 23:33:42 -06:00
Cheridan 07676b352d Merge pull request #8128 from Ikarrus/gangfixup
Makes Gang mode functional again
2015-03-05 21:11:59 -06:00
dannno 354f59f10c adds more barsigns 2015-03-05 14:06:44 -05:00
Swag McYolosteinen daa6fa89d0 Merge pull request #8014 from paprka/altclick2
Alt click for PDAs
2015-03-05 19:13:07 +01:00
WJohn 1c55a568f2 Merge pull request #8075 from Xhuis/the_coderbus
Adds the Coderbus and Adminbus bar signs: No merge conflicts edition
2015-03-05 13:08:33 -05:00
Swag McYolosteinen 652bac070b Merge pull request #8156 from Mandurrrh/trailsbugfix
Fixes #8116 trails bug
2015-03-05 19:00:39 +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
Mandurrrh 48daa155d7 Fixes #8116 trails bug 2015-03-04 19:53:11 -05:00
Cheridan e2554c55e6 Merge pull request #8147 from Cheridan/master
Manual Merge of #7607
2015-03-04 00:39:34 -06:00
Cheridan 56b0c321ac Merge branch 'BlobReroll' of git://github.com/RemieRichards/-tg-station into RemieRichards-BlobReroll
Conflicts:
	code/game/gamemodes/blob/overmind.dm
2015-03-04 00:33:44 -06:00
Cheridan 39cccb82e4 Merge pull request #8123 from Ikarrus/randomspawns
Randomizes Order of Job Spawn Points
2015-03-03 22:57:16 -06:00
Incoming 83cb66e3a3 Prevents centcom from sending the nuke code to a station that already defeated the blob (because you know they'd still blow themselves up) 2015-03-03 19:49:36 -05:00
Incoming 44d30afd20 Hotfix for Blob mulligan rounds. WHOOOOOPS 2015-03-03 19:42:01 -05:00
phil235 f5279273f1 Fixes many checks in construction from stacks, so you can no longer build two girders on top of each other for example. 2015-03-03 23:43:17 +01: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
Xhuis 2499ed82f4 Adds the ore satchel of holding 2015-03-03 07:26:58 -05:00
Swag McYolosteinen 5fcf0570b7 Merge pull request #8118 from Mandurrrh/pdabugfix
Fixes GhostPDA bug making it show in lobby. Please merge quick.
2015-03-03 11:26:48 +01:00
Swag McYolosteinen c2290c6c5c Merge pull request #7913 from phil235/NewPlants
Adds new plants to botany
2015-03-03 11:23:32 +01:00
Ikarrus e7109f984f knockout on conversion 2015-03-03 00:42:11 -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
Iamgoofball 3422390c94 fixes Ragin' Mages making only 1 mage 2015-03-02 21:08:51 -08:00
Ikarrus c62d387a1d Randomizes Order of Job Spawn Points
The ticker's setup() will shuffle the list of spawn points, so jobs won't always predictably spawn bottom-up and left-to-right
2015-03-02 20:01:36 -07:00
Mandurrrh c52a630a17 Fixes GhostPDA bug making it show in lobby. 2015-03-02 20:52:46 -05:00
Incoming ca54747be7 Fixes mulligan'd rounds from never ending because the shuttle was set to strand still
WHOOPS
2015-03-02 18:30:57 -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
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
Mandurrrh cde9de9e85 merge commits 2015-03-02 12:40:16 -05: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
Cheridan 1ef6cf1229 Merge pull request #8061 from Jordie0608/thisisindicativeofalargerrechargerconspiracy
Fixes #8052 Cyborg recharger density
2015-03-02 08:37:27 -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 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 960d3deeb0 Merge pull request #8023 from Jordie0608/youruniquenesswillbeassimilatedandthenturnedbrown
Fixes #7086 Job selection window width
2015-03-02 01:09:22 -06:00
Cheridan 73658a8c0b Updates SSU, Reprices Explosive Implants 2015-03-02 00:09:37 -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 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
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