Commit Graph

477 Commits

Author SHA1 Message Date
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
phil235 d2d0888432 Merge pull request #7726 from xxalpha/traymesons
Mesons+T-Ray = Engineering Goggles
2015-03-02 19:24:06 +01: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
TheVekter 52c5abd536 Adds new backpacks to job lockers also changelog 2015-02-27 20:26:17 -06:00
xxalpha 7859dd2fdf Removes Santa Hats from security wardrobe closets and other. 2015-02-28 01:01:19 +00: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
hornygranny f7342415c1 Merge pull request #7959 from phil235/AttackSelfTKFix
A bunch of fixes
2015-02-25 19:54:36 -08:00
Steelpoint 9ce2add084 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
Conflicts:
	icons/obj/guns/energy.dmi
2015-02-25 14:10:54 +08:00
paprka 1d552123dc hos gun revert 2015-02-24 21:54:48 -08:00
paprka 393123b50b Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs
Conflicts:
	code/modules/projectiles/gun.dm
	icons/obj/guns/energy.dmi
2015-02-24 20:03:33 -08:00
Steelpoint da53175ad5 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
Conflicts:
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi
2015-02-25 11:44:27 +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 79de9615dc Fixes not being able to prime grenade, toggle lamps and other attack_self things with TK.
Fixes the blobbernaut death animation looping.
Fixes armchair layer being above ghost layer.
Fixes chloral hydrate metabolization rate (and 2 other reagents)
Fixes a typo in closet/attack_self() .
2015-02-24 16:36:40 +01:00
Steelpoint 1db8a718a6 ChangeSpawnAreas 2015-02-23 01:48:20 +08: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
paprka dc4c4ea90b Merge branch 'master' of https://github.com/tgstation/-tg-station into megaphoney
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
2015-02-18 23:15:15 -08:00
Cheridan 116143006e Merge pull request #7746 from Incoming5643/BuyOneGetOneFreePets
Fixes the horrible injustice of getting too many pets
2015-02-18 09:38:24 -06:00
paprka 074a139576 Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs
Conflicts:
	icons/obj/guns/energy.dmi
2015-02-18 02:29:07 -08:00
Steelpoint 8b53405b17 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
Conflicts:
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi
2015-02-18 12:50:05 +08:00
paprka 8b12b14f59 hospistol and disabler stun revolver 2015-02-15 13:31:31 -08: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
Incoming 136b3ed67b Fixes the horrible injustice of getting too many pets 2015-02-14 23:54:20 -05:00
Cheridan 76f101de63 Merge pull request #7614 from paprka/preffer
Hard-light hazard holotape
2015-02-14 21:59:14 -06:00
xxalpha 28d1e9bad2 Several additions and new sprites.
Reverts glasses.dm
2015-02-14 19:24:41 +00: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
paprka c66327318d adds megaphones 2015-02-13 15:07:15 -08:00
paprka 54040d9867 stun changes and stun revolver 2015-02-13 09:26:31 -08:00
Steelpoint 940601bcfa Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
Conflicts:
	icons/obj/guns/energy.dmi
2015-02-13 01:14:52 +08:00
Cheridan 216630f1db Merge pull request #7572 from phil235/CookingOverhaul
Cooking overhaul
2015-02-12 08:01:17 -06:00
phil235 549b71a487 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
Conflicts:
	icons/obj/drinks.dmi

Fixing a couple typos. Making sure all eggs used in tablecraft recipes are boiled
2015-02-11 16:13:04 +01:00
Cheridan 65e8a4ce31 Merge pull request #7624 from paprka/defibfuckupv2
Defib changes
2015-02-11 08:37:28 -06:00
paprka 3e61bba236 defib changes 2015-02-08 17:06:34 -08:00
Kraseo 91c1a54abd closes the open() 2015-02-08 23:33:33 +01:00
paprka 424dd37782 hard-light holotape 2015-02-08 07:29:10 -08:00
Kraseo 4e18859e7b fixes lockers/bodybags/etc. shielding you from explosions. whoops! 2015-02-08 15:13:04 +01:00
Kraseo 08e7911f57 fixes a bunch of bugs 2015-02-08 13:27:55 +01:00
paprka c527491f41 Merge branch 'master' of https://github.com/tgstation/-tg-station into clothessec
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
2015-02-05 17:44:22 -08:00
phil235 e4464b3b9f Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul 2015-02-05 22:35:00 +01:00
Swag McYolosteinen 6fab02e7cd Merge pull request #7546 from TZK13/Purple-Shorts
Adds purple shorts
2015-02-05 18:16:14 +01:00
phil235 faba71fcca Cooking overhaul: adding tablecraft food recipes, customizable food, food ingredients (from bay)
- converted the microwave recipes to tablecraft recipes
- Added customizable food (thanks iamgoofball)
- added food ingredients (from baystation)
- changing food recipes a bit (replacing stuff with the new food ingredients)
- repurpose the microwave to actually cook certain food items.
- bowl is no longer trash but a reagent_containers/glass that is used in salad/soup recipes
- Changed the hunger system a bit, sugar becomes a normal reagent again. Adding a junkiness var to foods to drain mob satiety.
- milk carton is now a condiment bottle
- slight buff to vitamin
2015-02-05 16:48:25 +01:00
Steelpoint cd9a08e684 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
Conflicts:
	code/modules/projectiles/ammunition/energy.dm
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi
2015-02-04 18:36:50 +08:00
TZK13 01bf5b343f Adds purple shorts. 2015-02-04 01:23:58 -06:00
TZK13 8400ec9800 Adds work boots and fixes character setup previews. 2015-02-04 00:32:15 -06:00
paprka 495ae29ab8 helmet, armor, and corgi changes 2015-02-03 19:12:38 -08:00
paprka 890b3800e6 some clothing changes 2015-02-03 09:00:51 -08:00
paprka 6de33d4063 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff
Conflicts:
	_maps/map_files/generic/z2.dmm
2015-02-02 19:13:49 -08:00
Swag McYolosteinen 9bddcb3df4 Merge pull request #7492 from xxalpha/spacesuit_storage
Repath all non jetpack tank types to tank/internals
2015-02-02 18:52:51 +01:00
paprka 18a90495b2 updates to ERT stuff 2015-02-02 03:33:37 -08:00
paprka a5dcd1abd8 improves ert spawning and centcomm 2015-02-01 21:16:11 -08:00