23cb217905
Merge pull request #17299 from RandomMarine/mobile
...
Changes locker description
2016-05-01 22:26:15 -05:00
74bb2b28ab
makes sure people have the right types of armor
2016-05-01 18:59:51 -07:00
b3286b9d39
Fixes alt sprites not working. Changes sprites of HOP armor and BARKEEP armor.
2016-05-01 18:52:12 -07:00
d31f5ed876
Merge pull request #17280 from TechnoAlchemisto/I_can't_escape_my_cycles_of_guilt
...
Security Fashion Refactor
2016-05-01 19:33:22 -04:00
ed975d5785
Nerfs closet description
2016-04-30 20:44:32 -07:00
d8db2a1643
Merge pull request #17224 from ChangelingRain/IDlock
...
Hitting a locker or crate with an ID, PDA with ID, or wallet with ID will try to toggle the lock instead of opening it
2016-04-30 05:32:42 -05:00
03bce7b03d
three two one let's jam
2016-04-30 03:01:38 -07:00
6fc1d4fde4
Blobs can no longer eat the supermatter ( #17205 )
...
* Blobs can no longer eat the supermatter
* phil'd
* phil'd
2016-04-29 20:29:20 +02:00
034500f622
Merge pull request #17188 from phil235/FixClosetStuffing
...
Fixes weird shit happening when clickdragging things from your
2016-04-28 23:49:34 -05:00
49dd259cbc
Attacking a locker or crate with an ID-containing object will toggle the lock instead of opening it
2016-04-28 22:34:37 -04:00
cc59925d2e
Merge pull request #17108 from Bawhoppen/sandbagsz
...
Some sandbag changes
2016-04-27 20:23:21 -04:00
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
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
1192b48c97
moves krav gloves off of warden and into his locker
2016-04-26 16:41:53 -07:00
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
322fc535ad
sandbags rah rah rah
2016-04-25 05:04:11 -05:00
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
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
0480790b0a
Same things but with structures now.
2016-04-24 20:38:33 +02:00
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
6a3f1c843a
frankly, too fast
2016-04-23 21:55:15 -04:00
9fdfd4a49e
Hitting a closet with an item will try to open it
2016-04-23 21:53:11 -04:00
18ce641950
Merge remote-tracking branch 'refs/remotes/tgstation/master' into USA
2016-04-23 15:14:09 -05:00
fb87a435d1
Aliens and monkeys can now climb structures
2016-04-21 08:59:47 -04:00
3527347160
Shock Revolver
2016-04-18 21:29:43 -05:00
9bd1d57061
You can actually place items in crates now
2016-04-18 19:21:02 -04:00
0e43fa3344
la anchored mob meme
2016-04-16 13:26:24 -04:00
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
1b28d1ccf7
this is a better check
2016-04-16 13:14:06 -04:00
97a5a4cb9f
crate climbing
2016-04-16 13:05:15 -04:00
04f1aafa78
Exports
2016-04-13 06:01:40 +03:00
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
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
7809e4dc79
Merge pull request #16692 from Core0verload/cargo-improvements
...
New Engineering Crates, Shuttle Loan fix
2016-04-07 21:28:29 -05:00
a8890b264a
Merge pull request #16563 from lzimann/lockerfix
...
Fix a bug with stuffing people into lockers.
2016-04-08 00:00:22 +03:00
43798574f6
Engineering Crates
2016-04-07 03:26:18 +03:00
af51a66e37
Adds sandbags
...
* sandbgs an stuff
* mmmm
* fucking sandbags
* okokok
* aaaaaaaaaaaaaaaaaaaaaah
2016-04-02 23:52:12 -04:00
cb867fe314
Adds a new proc so multiple atoms can be watched for movement
2016-04-02 16:33:56 -03:00
b587496058
Fix locker stuffing
2016-04-02 00:02:50 -03:00
53fac5b31d
Ruins mining
2016-03-29 03:09:59 -05:00
32ef4ffe0a
Optimizations, statue changes
2016-03-26 21:24:10 -04:00
cc62b89baf
Fix bundle
2016-03-26 15:15:31 -04:00
5420596dd0
Merge pull request #15819 from xxalpha/october_12th_2555
...
Detective can be a traitor/double agent.
2016-03-11 12:50:32 -06:00
4e821d8657
Atoms may now have many mobs buckled to them, as opposed to one, this is controlled by the new max_buckled_mobs var on atoms, defaults to 1 as to not change any current functionality
2016-03-07 18:03:25 +00:00
2389fd0b01
Merge pull request #15899 from phil235/ResistandGrabFixes
...
Fixes being able to resist while dead.
2016-03-04 22:14:35 -03:00
c76f48e817
derp
2016-03-03 21:08:19 +01:00
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
0d8c212322
RPD
2016-03-03 03:58:13 -06:00
2bb41cd5b3
Merge remote-tracking branch 'refs/remotes/tgstation/master' into control_wand
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
2016-03-01 19:18:29 -06:00
41a42922d2
Merge pull request #15709 from Malkevin/cuffsandclean
...
Cuffs and sec clean up
2016-03-01 20:28:56 -03:00
Cheridan
TechnoAlchemist
Joan Lung
RandomMarine
KorPhaeron
phil235
PKPenguin321
Lularian
phil235
KorPhaeron
c0
Jack Edge
Razharas
bawhoppen
Lzimann
Xhuis
Remie Richards
tkdrg