hornygranny
e7d862b248
Merge pull request #6119 from Intigracy/recursivebyebye
...
Removes recursive explosions
2014-11-28 16:33:30 -08:00
Razharas
b3f79777c9
Merge pull request #6092 from optimumtact/patch-1
...
Stop items having a negative throw force against grilles
2014-11-28 15:16:59 +03:00
Intigracy
8a1baad03b
forgot the var / proc
2014-11-27 14:50:21 -08:00
Razharas
d2848e5f95
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-28 00:32:30 +03:00
Razharas
275d7fdd77
Merge pull request #6038 from paprka/hatfix
...
fixes head of security and warden hat flashbang confusion
2014-11-27 17:14:51 +03:00
Razharas
c5209f2399
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-27 15:30:37 +03:00
Orange Borg
c9665d4b2f
Stop items having a negative throw force against grilles
...
This prevents the grille from gaining health if you hit it with something less than 5 tforce
2014-11-27 12:07:55 +13:00
hornygranny
3ad160f98e
Merge pull request #6027 from fleure/airlockfix
...
Fixes multiple airlocks on same tile
2014-11-26 10:57:54 -08:00
hornygranny
fb3c9d7d11
Merge pull request #6062 from TZK13/yeloww
...
Fixes yellow wardrobes being invisible when you closed them
2014-11-26 10:57:30 -08:00
paprka
483166e5ae
detective bowman
2014-11-24 21:57:44 -08:00
paprka
882e868e7b
Fixed runtime and added syndie headset protection
2014-11-24 21:54:09 -08:00
TZK13
93370c7d93
Fixes yellow wardrobes being invisible when you closed them.
2014-11-24 21:41:33 -06:00
paprka
6d86949742
removes flashbang protection from hats, gives it to bowman headsets
2014-11-24 05:55:13 -08:00
phil235
1f4a071940
Fixing a similar bug with door assembly.
2014-11-24 13:21:25 +01:00
phil235
b725206f3a
Fix windoor construction exploit.
2014-11-24 13:12:00 +01:00
fleure
e8ca9ec224
Fixes multiple airlocks on same tile
2014-11-23 16:32:24 +00:00
Razharas
3511e0dada
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
...
Conflicts:
code/game/turfs/simulated/walls.dm
Ye somth liek dat
2014-11-23 17:46:14 +03:00
Cheridan
e1b5a6815b
Merge pull request #5856 from tkdrg/anotherbrickinthewall
...
Wall cleanup, attempt #2
2014-11-22 17:04:34 -06:00
hornygranny
dce9dadea2
Merge pull request #5914 from paprka/removewindows
...
Changes most border windows/firelocks to full tile
Gets paprika killed
2014-11-21 11:47:04 -08:00
Razharas
afac70c4f7
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-19 21:37:06 +03:00
Razharas
ff456ebaf4
Unwinded most of shit
...
Meh
2014-11-19 21:36:45 +03:00
Cheridan
8bfed4258b
Merge pull request #5922 from Steelpoint/BeretHoS
...
HoS Beret + Warden Drill Hat
2014-11-19 10:26:27 -06:00
paprka
bda5947d30
improves firelocks, window damage, and window deconstruction
2014-11-18 18:25:47 -08:00
Cheridan
c98448b5c2
Merge pull request #5650 from phil235/MechAtkFix1
...
All mechs get a melee attack
2014-11-18 12:53:52 -06:00
Razharas
b071a0167e
Made explosions work in a slightly different way
...
Yep
2014-11-18 16:22:41 +03:00
paprka
537c0705c9
health tweak to be additionally rounded
2014-11-16 20:54:19 -08:00
paprka
8ee2330c0f
fixed metastation, fixed basic window having no icon state
2014-11-16 17:57:29 -08:00
paprka
4822519c44
adds help intent check for repairing windows
2014-11-16 17:35:06 -08:00
paprka
c009049033
added window repairing
2014-11-16 17:26:55 -08:00
paprka
fd910387c3
windows damage and such
2014-11-16 17:13:33 -08:00
paprka
007ab4dd08
shuttle windows
2014-11-16 15:59:46 -08:00
paprka
706e03bd1b
Full tile window placing on grilles
2014-11-16 14:29:39 -08:00
Steelpoint
03a98a6295
HoSBeret
2014-11-16 22:32:01 +08:00
tkdrg
76edb3e44d
Merge remote-tracking branch 'upstream/master' into anotherbrickinthewall
...
Conflicts:
code/game/turfs/simulated/floor/misc_floor.dm
2014-11-16 01:30:24 -03:00
hornygranny
509c07650f
Merge pull request #5802 from paprka/EATITFATTY
...
Clothing sprite/file path changes
2014-11-15 20:28:43 -08:00
hornygranny
b6d0531c34
Merge pull request #5865 from paprka/hornygrannysuxlmaoxdplsmerge
...
Fixes a glass table related exploit
2014-11-14 10:54:39 -08:00
Remie Richards
b9f7496870
Merge pull request #5838 from tkdrg/lasertube
...
Lasers can now go through transit tubes
2014-11-14 18:21:50 +00:00
Remie Richards
890ad08d4b
Merge pull request #5851 from phil235/ContainerBreakOutFix
...
Resisting out of a closet no longer fails when locker is moved.
2014-11-14 18:20:09 +00:00
paprka
ec6b2424d2
purge the unused
2014-11-13 21:10:53 -08:00
paprka
40cdf3ffec
swat mask overhauls and such
2014-11-13 18:36:30 -08:00
phil235
a005055cf3
Merge branch 'master' of https://github.com/tgstation/-tg-station into MechAtkFix1
...
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/living_defense.dm
2014-11-13 17:17:23 +01:00
paprka
85d879fbf4
Removes brute damage from tabling
2014-11-12 19:54:33 -08:00
paprka
020d28fe3b
fixes a few glass table related bugs and adds more fun
2014-11-12 18:48:01 -08:00
tkdrg
d23edbd3b7
Merge remote-tracking branch 'upstream/master' into wallz
...
Conflicts:
code/game/objects/structures/false_walls.dm
code/game/turfs/simulated/walls_mineral.dm
2014-11-12 20:11:20 -03:00
tkdrg
393e5d6801
Wall cleanup, moving stuff into proper procs in the children objects when possible
...
Broken walls now drop a multi-sheet metal stack instead of many 1-sheet stacks
Walls now have a builtin_sheet for performance. Also fixes bananium wall bugs with not dropping the mineral.
2014-11-12 20:07:18 -03:00
phil235
1d2fac2162
Resisting out of a closet no longer fails when locker is moved.
2014-11-12 18:06:39 +01:00
tkdrg
6dfc9bbaac
Lasers can now go through transit tubes
2014-11-11 21:46:36 -03:00
paprka
56316c6129
bad placement for this particular line
2014-11-11 16:37:47 -08:00
paprka
da5cd74d53
fixes rack dupe exploit
2014-11-11 16:31:50 -08:00
hornygranny
f00d32abc1
Merge pull request #5803 from Menshin/sleeping_in_closets
...
Removes hilarious but useless sleep() in closets/boxes creation
2014-11-11 10:55:07 -08:00
