Commit Graph

2772 Commits

Author SHA1 Message Date
Cheridan 0cdffeecfb Merge pull request #8296 from phil235/TablecraftFix
Tablecraft Fix and recipe detection
2015-03-14 19:41:56 -05:00
phil235 0232afd05d Fix typo in catalyst.
Fix flamethrower crafting recipe (now only use 1 rod, calls checkparts() to set up the weldingtool and igniter).
Fix lack of message when trying to turn on an unsecured welding tool.
Fix lack of icon update when clicking plasma tank with empty flamethrower.
2015-03-15 00:23:47 +01:00
Cheridan 52dfa42eb5 Merge pull request #8257 from phil235/ReflectFix
Simplifies laser reflection code
2015-03-14 16:15:52 -05:00
Cheridan ecb3a4e08f Merge pull request #8236 from phil235/DoughChange
Dough change
2015-03-13 15:34:39 -05:00
Cheridan 3b89c07cd3 Merge pull request #8259 from phil235/BibleBookBagBug
Fixes book bags not being able to hold bibles and looking like backpacks
2015-03-13 12:51:10 -05:00
Cheridan 28f6aae00c Merge branch 'NinjaCleanup' of git://github.com/RemieRichards/-tg-station into RemieRichards-NinjaCleanup
Conflicts:
	icons/mob/back.dmi

remie is a nerd btw
2015-03-12 20:47:11 -05:00
phil235 16a0d7bf80 Fix for flamethrower deconstruction. 2015-03-12 19:58:37 +01:00
phil235 1eba7b694b Merge pull request #8134 from Miauw62/ghostradios
Adds a toggle so ghosts can hear radio chatter more easily.
2015-03-10 23:56:28 +01:00
Remie Richards 751fb4aaa9 Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks. 2015-03-09 21:48:45 +00:00
phil235 4f6c96235b Fixes book bags not being able to hold bibles.
Changes the book bag sprite so it looks more like a briefcase and isn't confused with a backpack.
2015-03-09 21:13:01 +01:00
phil235 82b1b1adcd Merge branch 'master' of https://github.com/tgstation/-tg-station into DoughChange
Conflicts:
	icons/obj/food.dmi
2015-03-09 19:48:23 +01:00
phil235 4071f25270 Simplifies laser reflection code, no more reflect_chance var at the obj/item level. 2015-03-09 12:28:35 +01:00
Cheridan fbab136950 Merge pull request #8016 from RemieRichards/EmbeddingBalance
Embedded Item Balancing. Also fixes #8029
2015-03-09 02:03:18 -05:00
phil235 1a092e0ede Changes how doughs are made. 10water+15flour chem reaction for dough. 15flour+15eggyolk+5sugar for cake batter (or alternatively for vegans 15 soymilk instead of the eggyolk).
Introduce egg yolk reagent
You can break eggs in open reagent containers or blend them to get egg yolk.
Fixes breadslices sprites and other merge conflict bugs in food.dmi.
Change customizable snack max volume to 60. Buff nutriment amount in doughs.
2015-03-08 22:15:55 +01:00
phil235 77d553e619 Fixes disposal climbing.
Aliens, slimes and monkeys can climb into disposal but cannot flush it.
Non carbon mobs can no longer climb into disposal by themselves.
Stuffing another mob in a disposal unit is now only done via grabbing.(fixes bugs like stuffing someone while being inside the disposal yourself)
Large mobs no longer fit inside disposal.
Fixes hydrotray growing overlay layer.
Fixes slicing broken pipes dropping a straight pipe.
Fixes typos.
Removing unused var from disposal.
2015-03-07 19:35:44 +01:00
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
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 07676b352d Merge pull request #8128 from Ikarrus/gangfixup
Makes Gang mode functional again
2015-03-05 21:11:59 -06:00
Swag McYolosteinen daa6fa89d0 Merge pull request #8014 from paprka/altclick2
Alt click for PDAs
2015-03-05 19:13:07 +01: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
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
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 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
Mandurrrh c52a630a17 Fixes GhostPDA bug making it show in lobby. 2015-03-02 20:52:46 -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
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
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
xxalpha 4b9bc1b233 Adds grayscale lighters and two new zippo styles.
Cleaned up proc.
2015-02-28 23:39:50 +00:00
Remie Richards 8cee97f54f Merge pull request #7942 from dannno/nothingmatters
THE OWL RETURNS
2015-02-28 16:06:35 +00:00
Mandurrrh e2d77899fa Change log and changes toggling ghostears to toggling ghostwhisper 2015-02-28 09:01:21 -05:00
TheVekter b794cf5211 New Botany backpack and satchel. Also fixes satchel spawning without iconstate. 2015-02-27 20:02:24 -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
Mandurrrh a0e19a466f Adds the ability to see pda messages with GhostEars toggled in deadchat. Port from bay. 2015-02-27 14:27:11 -05:00
TheVekter abee661784 Adds in Nienhaus' departmental backpacks and fixes itemstate for a few satchels. 2015-02-26 23:39:27 -06:00
Cheridan bcd3a5b3b7 Fixes metal foam dispenser mode for atmos backpack tank.
>>you will never refactor something without overlooking something dumb and breaking it
2015-02-26 22:26:12 -06:00
dannno 9b1fa2479b conflict fixing + changelog 2015-02-26 16:48:11 -05:00
dannno 23ecfeebf8 THE OWL RETURNS: PART 4: PRODUCT PLACEMENT
- adds The Owl and The Griffin prize toys to the arcade
- adds The Owl and The Griffin posters (legit and contraband respectively)
- adds The Nest barsign
2015-02-26 16:36:44 -05:00
Remie Richards 4a01237141 Buffs spear pain multiplier from 2 to 3, Makes spears embed when thrown by a human. 2015-02-26 17:24:48 +00:00