Commit Graph

1152 Commits

Author SHA1 Message Date
phil235 79a20bd57b slight fix 2015-03-09 19:19:17 +01:00
phil235 71d560bd3a Fixes a runtime with buckling screen alert
Fixes being able to buckle to janicart while crit and when there's a dense object on the janicart's turf.
Fixes alien nest not buckling and being wrongly pixel shifted, and fixed a runtime.
Fixes golems being super easy to weaken by punch and not doing more damage themselves via punch.
Fixes some typos.
2015-03-09 19:09:52 +01:00
Cheridan f4734de342 Merge pull request #8162 from Jordie0608/thisdrillwillnotpiercetheheavensbecauseithasbroken
Fixes #8148, Improves drill's handling of power
2015-03-08 23:41:50 -05:00
Remie Richards 7488c47e7a Merge pull request #8102 from Mandurrrh/tableclimbnerf
Balancing out tableclimbing.
2015-03-07 21:39:37 +00: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
Cheridan 0496dcd446 Merge pull request #8169 from dannno/morebarsigns
adds more barsigns
2015-03-06 13:35:13 -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
dannno 354f59f10c adds more barsigns 2015-03-05 14:06:44 -05: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
Jordie0608 a7e23d672a Improves drill's handling of power 2015-03-05 17:12:12 +11: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
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
Mandurrrh 2ec53ea6c7 Adds the second block for table climbing before the first return. 2015-03-02 16:53:15 -05: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
phil235 d2d0888432 Merge pull request #7726 from xxalpha/traymesons
Mesons+T-Ray = Engineering Goggles
2015-03-02 19:24:06 +01: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
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
Xhuis eb745941c5 Adds the Coderbus and Adminbus bar signs 2015-03-01 12:44:11 -05: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
Remie Richards 8cee97f54f Merge pull request #7942 from dannno/nothingmatters
THE OWL RETURNS
2015-02-28 16:06:35 +00:00
Razharas 4475f541b9 Merge pull request #8033 from TheVekter/medbackpacks
Gives Medical professions and Botany unique backpacks and satchels
2015-02-28 08:42:20 +03: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
dannno 2474e84299 REALLY FIXED THIS TIME LOL 2015-02-27 15:59:50 -05:00
dannno 027eccedbc conflicts fixed 2015-02-27 14:01:42 -05:00
Mandurrrh d2f44872aa Adds emp, emag, and repairs for barsign. 2015-02-27 12:01:09 -05:00
Remie Richards f7d3692a6b Clamps the value of pixel placed items between -(world.icon_size/2) and world.icon_size/2, so -16 and 16 respectively. 2015-02-26 23:17:59 +00: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
phil235 7171cd252b Fixes no blood dna on Mulebot and its blood tracks.
Fixes putting buckled mobs onto morgue trays.
Fixes mob pixel offset when unbuckled from roller bed.
Fixes blood trail appearing when pulling a patient on a roller bed.
Fixes other minor stuff.
2015-02-26 19:31:55 +01:00
hornygranny f7342415c1 Merge pull request #7959 from phil235/AttackSelfTKFix
A bunch of fixes
2015-02-25 19:54:36 -08:00
Swag McYolosteinen 4826037b00 Merge pull request #7981 from MrStonedOne/revert-7970-removegaytider
Revert "Removes grey tide barsign"
2015-02-25 18:47:53 +01:00
MrStonedOne 33d0507c8d Suggested changes to graytide sign's desc wording 2015-02-25 08:10:42 -08:00
Razharas 05b2ec1e5f Merge pull request #7420 from Steelpoint/HoSGun
Head of Security's Personal Firearm
2015-02-25 10:27:22 +03:00
MrStonedOne 48ce33f3cb Revert "Removes grey tide barsign" 2015-02-24 23:04:16 -08:00
Cheridan 9ba1dfaa26 Merge pull request #7970 from paprka/removegaytider
Removes grey tide barsign
2015-02-25 00:29:36 -06: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
paprka 830b57afd5 removes grey tide barsign 2015-02-24 15:32:58 -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
Swag McYolosteinen 984b7cb8f6 Merge pull request #7738 from Incoming5643/mediborg_inbuiltstretcher
Mediborg Improvement Drive: Roller Robo Da
2015-02-23 17:10:43 +01:00
hornygranny fe1ad1a152 Merge pull request #7861 from phil235/OfficeChairLayerFix
Fixes office chair layer not updating when moving the chair around.
2015-02-22 20:19:13 -08:00