Commit Graph

1814 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 d56cb89407 Merge pull request #8076 from xxalpha/lighters
Grayscale Lighters
2015-03-06 00:00:51 -06:00
Cheridan 07676b352d Merge pull request #8128 from Ikarrus/gangfixup
Makes Gang mode functional again
2015-03-05 21:11:59 -06: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
Xhuis 2499ed82f4 Adds the ore satchel of holding 2015-03-03 07:26:58 -05: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
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 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
TheVekter b794cf5211 New Botany backpack and satchel. Also fixes satchel spawning without iconstate. 2015-02-27 20:02:24 -06: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
phil235 809a1be279 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
Conflicts:
	icons/mob/head.dmi
2015-02-25 18:50:42 +01:00
Razharas 588c79873f Merge pull request #7562 from Iamgoofball/drugs
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
2015-02-25 08:26:21 +03:00
Iamgoofball c0ae53a566 changes and shit, adds prespawn colorful smoke grenade for fun times and adminning 2015-02-24 20:15:06 -08:00
Remie Richards b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
phil235 2d5fe2b41e Merge pull request #7922 from Mandurrrh/clownbugs
Fixes #7910 and #7909 clown related bugs.
2015-02-24 18:56:30 +01:00
hornygranny b49a5a934c Merge pull request #7918 from paprka/weldingshitty
Fixes welding tools using fuel when switched on
2015-02-23 15:52:25 -08:00
Razharas e889ee7a42 Merge pull request #7700 from RemieRichards/ExplosionsAndEmbedding
Items Embedding in Limbs
2015-02-24 01:22:01 +03:00
hornygranny c0c8a739e2 Merge pull request #7721 from paprka/miening
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
Mandurrrh e03d98786b Fixes #7910 and #7909 clown related bugs. 2015-02-22 20:53:39 -05:00
paprka 8c1af4da25 welder fuel usage on switch 2015-02-22 14:15:04 -08:00
phil235 bd870d649c Adds new plants to botany (rice, oat, blue cherries, holy melon, parsnip, geranium, lily, snap corn, blumpkin, mimana, sweet potato, vanilla, red beet) and adding two new reagents (vanilla and rice). 2015-02-22 22:10:25 +01:00
Razharas 55208e408d Merge pull request #7419 from paprka/beltoveray
adds a simple overlay system for belts
2015-02-20 07:06:20 +03:00
Remie Richards 42fe551665 Merge branch 'master' of https://github.com/tgstation/-tg-station into ExplosionsAndEmbedding
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2015-02-19 18:16:33 +00:00
Remie Richards 5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
hornygranny 7905cc618d Merge pull request #7773 from phil235/HoloSignFix
Fixes the holosign projector sign count not increasing after destroying old signs.
2015-02-18 12:59:50 -08:00
phil235 cf3f03c039 Merge pull request #7479 from paprka/batonshit
Makes batons slowly lose charge when left on
2015-02-18 21:49:25 +01:00
phil235 67f4cc75d9 Fixes the holosign projector not increasing after destroying old signs. 2015-02-16 22:57:06 +01:00
Cheridan 15439b8c4e Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix
Conflicts:
	code/game/gamemodes/wizard/artefact.dm
2015-02-15 10:27:50 -06:00
paprka 743af3a5b2 processing |= 2015-02-14 19:43:27 -08:00
paprka f6942bb955 Merge branch 'miening' of https://github.com/paprka/-tg-station into miening 2015-02-14 17:26:19 -08:00
paprka b67f9cec72 Merge branch 'master' of https://github.com/tgstation/-tg-station into miening 2015-02-14 17:08:39 -08:00
Cheridan 5e0e4828bd Merge pull request #7706 from phil235/TrackImplantFix
Fix tracking implant description when inserted inside implant pad.
2015-02-14 15:57:16 -06:00
paprka 24cef3c30a fixes baton looping 2015-02-14 12:41:37 -08:00
phil235 135293bedf Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.
Fixes Alien embryo processing that was processed twice.
2015-02-14 14:18:49 +01:00
Iamgoofball c119fede36 sponsored by DaZe 2015-02-13 23:40:43 -08:00
paprka 85675e92b8 my good judgement gets the better of me 2015-02-13 21:50:00 -08:00
paprka 88760896ad initial commit 2015-02-13 20:59:39 -08:00
paprka 46d21ae2c2 robots lose power from their cell for leaving their baton active 2015-02-13 17:48:58 -08:00
phil235 9bd3c1d8a6 Fix tracking implant description when inserted inside implant pad. 2015-02-13 20:09:48 +01:00
Remie Richards ab754b6182 Corrects all spellings of Embedds --> Embeds 2015-02-13 13:15:20 +00:00
Remie Richards 34ced43f45 Explosions throw items, items can embed in limbs, embedded items cause damage, embedded items can fall out, surgery for embedded item removal, ninja throwing stars! 2015-02-13 12:59:02 +00:00
phil235 897618d42f Fixed some recipes in chef recipes book. Fixed jelly sandwich recipes. Remove unused milk/soymilk carton sprites from drinks.dmi 2015-02-12 21:39:20 +01:00
Cheridan 216630f1db Merge pull request #7572 from phil235/CookingOverhaul
Cooking overhaul
2015-02-12 08:01:17 -06:00
Remie Richards 6613851028 Merge pull request #7593 from Cheridan/pin_fix
Pin fixes, additions
2015-02-12 06:43:11 +00:00