Commit Graph

511 Commits

Author SHA1 Message Date
phil235 2ed906b990 Fixes inhand sprites for eggs.
Fixes heart underwear sprite being too big.
Fixes being able to push a janicart through plastic flaps.
Fixes ERT medic closet starting with a combat defib with no cell. Empty combat defib can now get a cell inserted.
Fixes inconsistency in nukeop pinpointer upon activation, it now says standard pinpointer message plus the current mode (shuttle or disk).
2015-04-14 17:41:36 +02:00
phil235 4ef5aa93dc Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
Conflicts:
	icons/obj/food.dmi
2015-04-09 17:38:14 +02:00
phil235 06f09fcd81 Merge pull request #8830 from Jordie0608/howdoyouknowyourbestfriendisntsecretlyawizard
Icon_door customability fix
2015-04-09 14:27:30 +02:00
Jordie0608 a405022ac9 State fixes 2015-04-09 16:27:39 +10:00
phil235 e6e0143ec5 Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2015-04-08 19:36:49 +02:00
Jordie0608 24d047a116 icon_door customability fix 2015-04-09 00:05:16 +10:00
Cheridan f537b43108 Merge pull request #8789 from phil235/BeartrapFix
Pull, resist, beartraps
2015-04-08 08:38:01 -05:00
Jordie0608 ad33641101 Merge branch 'master' of https://github.com/tgstation/-tg-station into howdoyouknowyourbestfriendisntsecretlyawizard
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
	icons/obj/closet.dmi
2015-04-08 22:51:45 +10:00
Jordie0608 ffbef1f7d9 inversed check fix 2015-04-08 16:22:51 +10:00
Jordie0608 60cf76c881 fixes 2015-04-08 16:11:56 +10:00
Jordie0608 37277f66e7 pre-map compile 2015-04-08 15:40:41 +10:00
phil235 8499413649 Makes living/verb/resist more object oriented.
Adds a fourth mob size "MOB_SIZE_TINY" to differentiate corgi size and mouse size. (used in bear trap code)
Rewrites beartrap/Crossed() to have less istype checks.
Adds a flying var to simple animals (used in bear trap code)
Makes pulling update in living/life.dm() to fix pulling not stopping when you're incapacitated.
2015-04-06 18:45:37 +02:00
phil235 f9f618d699 Adding the chemical reactions and recipes for the new recipes.
Changes the glasses of what? to use an overlay with reagents color.
Adding a ricepack to the kitchen cabinet and the food crate.
Adding more bowl to the dinnerware vending machine.
Adding pumpkinjuice, blumpkingjuice, cherryshake, bluecherryshake pumpkin latte, drunken blumpkin reagents.
2015-04-04 19:29:12 +02:00
Jordie 3bb6cc8af9 Merge pull request #8625 from xxalpha/cyberplus
Cyber Implants +
2015-04-04 20:57:48 +11:00
xxalpha 7ec043a542 Added medical hud implant to CMO locker. Added chest implant sprites. 2015-04-04 00:56:06 +01:00
phil235 493c3e038a Splitting food.dmi into smaller files.
Repathing meat slab, meatsteaks and cutlets into meat/slab, meat/steak, meat/rawcutlet, meat/cutlet. Fixes issue with food naming when containing meat stuff, especially human meat.
Bowl filled with reagent now gets a nice half transparent overlay with the reagents colors (like beaker)
Mousedroping a snack that's on a table now opens the tablecrafting window.
Fixes not being to store items in plain bread, plain cake and cheesewheel.
2015-04-03 21:59:56 +02:00
Cheridan 884e9e3774 Day Who-Knows: Bar Gambling Expansion!
Space cash is stacks
Adds dealer table to map
2015-03-29 18:09:54 -05:00
phil235 e80a50f1c7 Fixes not being able to put unlit welding tool in open closets and not being able to open a closet with an unlit welding tool in your hand. 2015-03-28 00:12:06 +01:00
hornygranny 506da51f96 Merge pull request #8455 from Incoming5643/how_bout_I_get_you_some_stones
Adds click delay to smacking up statues
2015-03-23 16:31:53 -07:00
Swag McYolosteinen 53e40ec315 Merge pull request #8427 from Cheridan/day3_collars
Event Day 3 - Pet Collars!
2015-03-22 19:37:12 +01:00
Nienhaus 9486248553 Merge pull request #8440 from dannno/coperite
GAR GLASSES
2015-03-22 12:05:21 -05:00
Jordie d361649df5 Merge pull request #8369 from pudl/retardfix
normal sec headset
2015-03-21 17:23:18 +11:00
Incoming 5861b643b6 Adds click delay to smacking up statues. Fixes #8313 2015-03-20 23:50:25 -04:00
Swag McYolosteinen d95209a5df Merge pull request #8391 from Incoming5643/Statue_of_limitations
Fixes invincible unstoppable death statues
2015-03-20 17:43:22 +01:00
dannno 29477dfccc adds GAR glasses of various flavors
you're welcome
2015-03-20 01:29:54 -04:00
Jordie e5fdddc7d8 Merge pull request #8289 from Xhuis/alt_clicking
Allows alt-clicking for some stuff
2015-03-19 16:43:53 +11:00
Cheridan a66018cb4b Adds collar to HoP closet 2015-03-19 00:18:56 -05:00
Cheridan 7149f0382d Adds Pet Collars!
Map needs update now
2015-03-18 21:27:21 -05:00
Incoming 612ededfd0 Removes factions from sentient mobs, as they both don't need them being player contr and it leads to some really exotic bugs.
Fixes an unreported bug where statues could bleed out
2015-03-17 14:26:05 -04:00
pudl 485231c7f8 security officers once again have the choice of a normal headset 2015-03-15 23:32:54 -05:00
Cheridan da1e6f57f0 Merge pull request #8334 from MrPerson/cleanup_crew_comin_through
Code cleanup
2015-03-15 01:55:39 -05:00
MrPerson 9038fb15af Code cleanup
Removed a bunch of unused or hardly used vars on /mob and /atom/movable.
Added defines for mob/living/var/mob_size so it's not using magic numbers.
2015-03-13 10:41:00 -07:00
Xhuis 3bf0c7015a Replace some object verbs with alt-clicking 2015-03-10 21:28:13 -04: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
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