Commit Graph

1954 Commits

Author SHA1 Message Date
phil235 fb93f88fca Fixes weird shit happening when clickdragging things from your inventory into a closet to stuff it in. You can now only stuff mobs and items into closet, and you cannot stuff things that are inside something (mostly your inventory). 2016-04-28 01:45:44 +02:00
KorPhaeron cf08028eb0 Merge pull request #17046 from PKPenguin321/krav-sec-warden
Gives krav maga gloves to the warden
2016-04-27 16:09:04 -05:00
Razharas c396cd5be5 Fixes falsewalls being unsmashable (#17135)
* Fixes falsewalls being unsmashable
2016-04-27 17:29:56 +02:00
PKPenguin321 1192b48c97 moves krav gloves off of warden and into his locker 2016-04-26 16:41:53 -07:00
phil235 6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
erwgd 02b29f888a Prevents collapsing roller beds or grabbing chairs whilst incapacitated (#17074)
* added if(usr.incapacitated) for grabbing a chair

* added if(usr.incapacitated()) for collapsing a roller bed
2016-04-26 19:41:21 +02:00
Joan Lung ad9eec737f Merge pull request #17083 from coiax/ian-looks-very-fashionable-today
Refactors dog clothing
2016-04-25 11:46:44 -04:00
KorPhaeron 3934b7ae3d Merge pull request #17078 from ChangelingRain/opensesame
Hitting a closet with an item will try to open it
2016-04-25 01:00:50 -05:00
phil235 fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
phil235 43e98079f1 Removing some comments I had left in. 2016-04-24 21:12:04 +02:00
phil235 639ff5d161 Doors can now be attacked when clicked on harm intent. (they're currently indestructible so it's only cosmetic for now). I tried to make door code more OOP. 2016-04-24 20:39:30 +02:00
phil235 0480790b0a Same things but with structures now. 2016-04-24 20:38:33 +02:00
phil235 0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
Jack Edge 0fd1f3c7e4 Made /datum/dog_fashion 2016-04-24 13:18:43 +01:00
Nerd Lord 6a3f1c843a frankly, too fast 2016-04-23 21:55:15 -04:00
Nerd Lord 9fdfd4a49e Hitting a closet with an item will try to open it 2016-04-23 21:53:11 -04:00
KorPhaeron 18ce641950 Merge remote-tracking branch 'refs/remotes/tgstation/master' into USA 2016-04-23 15:14:09 -05:00
Nerd Lord fb87a435d1 Aliens and monkeys can now climb structures 2016-04-21 08:59:47 -04:00
KorPhaeron 3527347160 Shock Revolver 2016-04-18 21:29:43 -05:00
Nerd Lord 9bd1d57061 You can actually place items in crates now 2016-04-18 19:21:02 -04:00
Cheridan abb48c84eb Merge pull request #16920 from PKPenguin321/patch-5
[s] FUCKING GHOST FAGS
2016-04-18 14:27:18 -05:00
Cheridan c43d69bd0c Merge pull request #16919 from ChangelingRain/voicefromthecrate-r
You can now climb onto crates
2016-04-18 14:12:54 -05:00
Cheridan e7f7704099 Merge pull request #16921 from RandomMarine/theclothening
Biogenerated cloth stacks.
2016-04-18 02:27:36 -05:00
PKPenguin321 c6b9b620fb istype(user)
i hope i did that right
2016-04-17 15:15:52 -07:00
Joan Lung d1e90e4dc6 Merge pull request #16915 from coiax/holodeck-chairs
Wooden holodeck chairs can no longer be picked up
2016-04-17 11:56:29 -04:00
Jack Edge 336612f663 You can't pick up NODECONSTRUCTed chairs 2016-04-17 14:39:42 +01:00
RandomMarine 76212a5fb9 Implements cloth stacks 2016-04-16 12:56:37 -07:00
PKPenguin321 e5a9920874 fixes ghost fire extinguishers FOR REAL 2016-04-16 10:58:30 -07:00
Nerd Lord 0e43fa3344 la anchored mob meme 2016-04-16 13:26:24 -04:00
Nerd Lord f073b3508b butterflies don't lie, so you can't stuff them into crates?
that's dumb, let's fix it
2016-04-16 13:15:25 -04:00
Nerd Lord 1b28d1ccf7 this is a better check 2016-04-16 13:14:06 -04:00
Nerd Lord 97a5a4cb9f crate climbing 2016-04-16 13:05:15 -04:00
nullbear 1cb85c3024 Fixes monkey cube Dupe Glitch
fixes https://github.com/tgstation/-tg-station/issues/14667

Adds some consistency, allowing monkeys to be drag dropped onto the
monkey recycler, like they are with the disposals chutes.

Prevents grabs from being placed in disposals, as they were being
before.
2016-04-15 21:36:34 -07:00
c0 04f1aafa78 Exports 2016-04-13 06:01:40 +03:00
KorPhaeron eb78787083 Throwing 2016-04-08 23:18:46 -05:00
Cheridan e6e4ee9998 Merge pull request #16725 from PKPenguin321/patch-9
fixes magic extinguisher cabinets
2016-04-08 17:53:54 -05:00
KorPhaeron 82786783f4 Merge pull request #16716 from coiax/plant-genes
Added a "plant DNA manipulator" to Botany backroom
2016-04-08 16:34:34 -05:00
Jack Edge d362a2f5e5 Added plant gene disks to secure botany lockers
The Botany plant DNA machine isn't useful without the diskettes. So here
they are.
2016-04-08 10:22:46 +01:00
KorPhaeron 7809e4dc79 Merge pull request #16692 from Core0verload/cargo-improvements
New Engineering Crates, Shuttle Loan fix
2016-04-07 21:28:29 -05:00
PKPenguin321 d1d9111fe0 fixes copypasted varnames
i am a scum coder who dual mains ctrl+c and ctrl+v
2016-04-07 15:21:42 -07:00
PKPenguin321 00315cff35 fixes magic extinguisher cabinets
spirits begone
2016-04-07 15:19:26 -07:00
Razharas a8890b264a Merge pull request #16563 from lzimann/lockerfix
Fix a bug with stuffing people into lockers.
2016-04-08 00:00:22 +03:00
KorPhaeron b5b523f7f0 Black Bedsheets 2016-04-07 14:42:26 -05:00
c0 43798574f6 Engineering Crates 2016-04-07 03:26:18 +03:00
oranges aed000580c Keep pixely layout when changing sign type
This stops signs realigning to your turf when you go to change the sign
type.

Also slight sanity check for adjacency after user uses pen
2016-04-06 14:02:47 +12:00
Cheridan 90cb067020 Merge pull request #16621 from duncathan/atmosspawnair
Makes atmos_spawn_air() use the new gas string parser
2016-04-05 11:38:12 -05:00
KorPhaeron 9e77efb176 Merge pull request #16610 from PKPenguin321/patch-9
fixes a godawful message
2016-04-04 20:52:51 -05:00
Cheridan 866c418f78 Merge pull request #16592 from bgobandit/ocd
Alt-clicking a fire extinguisher cabinet opens/closes it.
2016-04-04 17:43:37 -05:00
duncathan 497a4efc70 makes atmos_spawn_air() use the new gas string parser 2016-04-04 01:49:09 -06:00
PKPenguin321 d098b2594f you cant hide from me you little shit 2016-04-03 18:57:32 -07:00