Commit Graph

92 Commits

Author SHA1 Message Date
phil235 15d8e0a96f I refactored how a mob resisting out of a closet that is itself inside something is done.
Fixes not being able to resist out of an unlocked unwelded locker. Now both moving and the resist button  work (except for the cardboard box).
You can no longer spam breakingout message ouf of a closet by moving while inside.
Wrapping and unwrapping a locker no longer unwelds it magically.
I refactored closet/crate/item package wrapping.
You can packagewrap belts and other storage items in which the package wrap item doesn't fit.(it does currently have the unintended side effect of giving you the "doesn't fit in X" message when wrapping there storage items though).
2016-03-03 20:20:34 +01:00
SouDescolado 3b257854f0 Merge pull request #1 from tgstation/master
Merge shit
2016-01-05 14:44:37 -02:00
SouDescolado 92b3c84a22 Make the code beautiful
Less lines, same code.

Trying to fix merge conflict.

Gah
2016-01-05 14:36:39 -02:00
Lularian cb50a25772 gives barman his cool stuff again 2016-01-03 19:35:49 -06:00
bawhoppen 3543175c51 Revert "fixes attempt two" 2016-01-03 19:05:52 -06:00
Lularian f5bc4b6b4f woops 2016-01-03 17:50:20 -06:00
KorPhaeron d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
Steelpoint ac57b4ee03 InitalCommit 2015-10-12 11:59:33 +08:00
Steelpoint b5ded1c9e8 InitalCommit 2015-10-03 21:22:29 +08:00
Razharas 93b9f96cfa Merge pull request #11341 from bgobandit/suicideisnotajoke
Adds/tweaks several suicide messages.
2015-09-06 06:42:00 +03:00
c0 df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
bgobandit 4909600303 Adds/tweaks several suicide messages. 2015-08-23 15:02:34 -04:00
Memendia 6b649e583b Grammar Fix 2015-08-12 21:09:39 -07:00
Jordie 82d964957a Merge pull request #10687 from Steelpoint/OfficerMask
[FLUFF|BALANCE] Security Officers Sec Breathmask in Internals Box
2015-07-25 20:19:38 +10:00
Steelpoint f4dd5604d6 Commit 2015-07-18 19:39:33 +08:00
Steelpoint 6a3b9ef284 Merge branch 'master' of https://github.com/tgstation/-tg-station into AyylienGun
Conflicts:
	code/game/objects/items/weapons/handcuffs.dm
2015-07-16 18:11:33 +08:00
Steelpoint f96fdab622 CuffSprites 2015-07-15 19:38:29 +08:00
Steelpoint 60f05dc1ff AlienBox+AlienPaper 2015-07-15 15:05:01 +08:00
xxalpha 66e2941531 Adds an empty hugbox for admins to give.
Maintbox

Re-added hugbox to boxstation perma.
2015-07-12 17:44:13 +01:00
Ikarrus 12eb6a06cd Squash and revert map change 2015-07-08 15:12:00 -06:00
Ikarrus 3f21a78ab7 Adds a Hugbox
You can hug it.
2015-07-08 10:30:21 -06:00
Ikarrus 8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
phil235 081bae6740 Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +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
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
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 88760896ad initial commit 2015-02-13 20:59:39 -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
xxalpha a9c181bbcc Repath all non jetpack tank types to tank/internals
Repath all portable tanks to tank/internals, except jetpacks

Update ministation
2015-02-01 18:25:39 +00:00
Steelpoint 18fe642fcc ERTBalanceV2 2015-01-29 19:03:07 +08:00
Iamgoofball bc9d48fa42 Mutadone and Mannitol, tweaks and changes. 2015-01-16 19:28:13 -08:00
Iamgoofball 38070820f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchem_shoehorn_backup 2015-01-16 17:25:50 -08:00
Iamgoofball f3398e58a9 Removes Star Trek chemistry and transfers us to Goon Chemistry. 2015-01-16 17:21:36 -08:00
Cheridan 03e1d0d60a -Adds firing pin box define
-Examining a gun now shows its pin
-You can now emag a firing pin to make it function without checks.
-Loyalty pins unable to be constructed
2015-01-12 21:21:34 -06:00
phil235 b6e35278e3 Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.
Fixes the washing machine being able to change boxing gloves, ninja gloves and botany gloves to look like simple colored gloves. Creating a /gloves/color category for all gloves whose color can be changed.
Fixing some absolute pathing.
2014-12-26 17:04:09 +01:00
paprka 3bd3175a18 Removed unused armbands 2014-12-13 00:14:03 -08:00
paprka e9477cfe9d initial commit for better security clothing 2014-12-11 11:50:52 -08:00
Razharas 876a5b1bfb Fix for storages and equip
Yeah
2014-11-27 19:28:03 +03:00
Menshin cdd5128d47 Removed hilarious but useless sleep() in closets/boxes New() 2014-11-10 01:59:32 +01:00
paprka b99499e277 fixes utility medipen bundle for miners 2014-11-05 18:02:14 -08:00
hornygranny 6e11157661 Merge pull request #5520 from paprka/minerscrubs
Improves mining equipment prices, rebalances medipens
2014-11-03 17:12:02 -08:00
paprka 1b91ab24ce Improves mining equipment locker and rewards system, and buffs kinetic accelerator 2014-10-28 15:42:55 -07:00
phil235 b971a09bcd Wrapping something with package wrapper now gives a message.
Adding a check so clicking an already giftwrapped item doesn't show the wrapping message.
Adding nobludgeon flag to wrapping paper to remove attack messages
Removing w_class line from package wrapper because already in its parent.
Remove the unnecessary message (box is full/packagewrapper doesn't fit in the box) when wrapping box.
Fixes not being able to wrap box with just one single package wrapper left.
Fixing attack_log (fix issue4180) and only adds log when the wrapping succeeds.
Now using wrapping paper actually uses its amount.
when all used, they will drop cardboard tube like intended.
Fixes issue4207
Fixes not being able to re-add wrapping paper and package wrapper to themselves like proper stacks.
New sprite for both paperwrap and cardboard tube. (from Nienhaus)
2014-10-23 19:30:09 +02:00
Cheridan 4adb8c0c9a Merge pull request #5316 from xxalpha/fix_flasher
Fixes cyborgs being able to add their flashes to things
2014-10-19 17:44:30 -05:00
xxalpha d9dafa9649 Fix cyborg flashes being useable in flashers and cyborg heads. 2014-10-19 04:35:10 +01:00
Remie Richards e124c29f8d Merge pull request #5201 from Cheridan/permits
Adds Construction Permits
2014-10-17 05:24:37 +01:00
Cheridan 5eb6a82970 Merge branch 'master' of https://github.com/tgstation/-tg-station into permits
Conflicts:
	icons/obj/items.dmi
2014-10-11 17:48:46 -05:00
Cheridan 84e7121903 Adds construction permits 2014-10-11 17:39:27 -05:00
paprka b2ca9776fd expands medipens 2014-10-09 18:01:35 -07:00