e8ca9ec224
Fixes multiple airlocks on same tile
2014-11-23 16:32:24 +00:00
e1b5a6815b
Merge pull request #5856 from tkdrg/anotherbrickinthewall
...
Wall cleanup, attempt #2
2014-11-22 17:04:34 -06:00
002ecddba3
Merge pull request #5849 from phil235/SoapMsgFix
...
Fixes the mouth washing message
2014-11-22 19:08:55 +01:00
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
7feaa1cf66
Merge pull request #5934 from paprka/defibbuff
...
Buffs defibrillator PNR to 5 minutes
2014-11-21 10:30:38 -06:00
448d0fab7f
Merge pull request #5913 from tkdrg/yearslater
...
Makes cyborg modules NODROP
2014-11-21 10:17:53 -06:00
a9199118e5
Merge pull request #5925 from paprka/flashfix
...
Fixes flashes being useless
2014-11-21 10:14:39 -06:00
41c86dd557
fixes disarming affecting area stuns
2014-11-21 08:06:07 -08:00
0da09e3f6b
Merge pull request #5557 from Incoming5643/magicmania1.76
...
Magic Mania 1.76: Lets outrun the feature freeze
2014-11-20 09:07:41 -06:00
8bfed4258b
Merge pull request #5922 from Steelpoint/BeretHoS
...
HoS Beret + Warden Drill Hat
2014-11-19 10:26:27 -06:00
bda5947d30
improves firelocks, window damage, and window deconstruction
2014-11-18 18:25:47 -08:00
1208c48af3
Merge pull request #5652 from Menshin/atmos_z_level_fix
...
Atmos z level fix + radio controller code sanitization
2014-11-18 17:05:14 -06:00
c98448b5c2
Merge pull request #5650 from phil235/MechAtkFix1
...
All mechs get a melee attack
2014-11-18 12:53:52 -06:00
e205c8f2f6
Merge pull request #5857 from paprka/lolnames
...
Fixes a bunch of capitalization inconsistencies, adds names to vendors
2014-11-18 03:46:26 +03:00
639594c7f9
Merge pull request #5890 from Jordie0608/iwhoopsedalloverit
...
Fixes #5840 Improves stun baton messages
2014-11-17 11:46:06 -08:00
53d913bc7f
Merge pull request #5924 from tkdrg/junk
...
Removes unticked unused code from the tree
2014-11-17 13:34:49 -06:00
85f735c504
Merge pull request #5878 from phil235/DroneShardFix
...
Fixes drones cutting their hands when using shards.
2014-11-17 09:55:19 +00:00
12ec40d246
buffs defibrillator PNR to 5 minutes
2014-11-16 21:22:05 -08:00
537c0705c9
health tweak to be additionally rounded
2014-11-16 20:54:19 -08:00
8ee2330c0f
fixed metastation, fixed basic window having no icon state
2014-11-16 17:57:29 -08:00
4822519c44
adds help intent check for repairing windows
2014-11-16 17:35:06 -08:00
c009049033
added window repairing
2014-11-16 17:26:55 -08:00
fd910387c3
windows damage and such
2014-11-16 17:13:33 -08:00
007ab4dd08
shuttle windows
2014-11-16 15:59:46 -08:00
649be7cf8a
Fixes flashes being useless
2014-11-16 14:39:50 -08:00
706e03bd1b
Full tile window placing on grilles
2014-11-16 14:29:39 -08:00
608dec814e
Removes old/unused code from the tree. Use version control if you need it for some reason.
2014-11-16 16:53:18 -03:00
0f28c013ff
Makes cyborg modules NODROP
2014-11-16 15:59:57 -03:00
6fba9b3a19
Merge pull request #5688 from Jordie0608/isitpronouncedlockorloch
...
Fixes #5613 null acid loc
2014-11-16 20:22:08 +03:00
03a98a6295
HoSBeret
2014-11-16 22:32:01 +08:00
54299ac9b4
Merge pull request #5812 from fleure/nozfix
...
Fixes nozzle deleting and adds some safety to nozzle toggling
2014-11-16 13:44:42 +03:00
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
509c07650f
Merge pull request #5802 from paprka/EATITFATTY
...
Clothing sprite/file path changes
2014-11-15 20:28:43 -08:00
ac6d5b9558
Merge pull request #5861 from tkdrg/moarfloors
...
Floor refactor MkII
2014-11-15 20:13:50 -08:00
fbbc77f905
Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.76
...
Conflicts:
code/modules/projectiles/projectile/magic.dm
2014-11-15 14:44:51 -05:00
4f81da5bdf
Merge pull request #5797 from Steelpoint/BeltFix
...
Fix: SecBelts can hold Tear Gas Grenades
2014-11-15 01:03:46 +03:00
a4d0cfeba5
Merge pull request #5880 from phil235/FlashbangRuntimeFix
...
Fixes the flashbang runtime.
2014-11-14 22:38:00 +03:00
b6d0531c34
Merge pull request #5865 from paprka/hornygrannysuxlmaoxdplsmerge
...
Fixes a glass table related exploit
2014-11-14 10:54:39 -08:00
e771e8f91e
improves stun messages
2014-11-15 05:48:47 +11:00
77a6df36f7
Merge remote-tracking branch 'upstream/master' into moarfloors
...
Conflicts:
_maps/map_files/MetaStation.v39K.dmm
_maps/map_files/MiniStation/MiniStation.dmm
_maps/map_files/tgstation.2.1.3.dmm
code/game/machinery/bots/floorbot.dm
2014-11-14 15:23:35 -03:00
b9f7496870
Merge pull request #5838 from tkdrg/lasertube
...
Lasers can now go through transit tubes
2014-11-14 18:21:50 +00:00
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
da8acb2ded
Merge pull request #5845 from phil235/StunBatonAtckAnimFix
...
Fixes the lack of attack animation when using the stun baton a certain way
2014-11-14 18:17:37 +00:00
0fa48252c9
reworked acid's ticks and locationing
2014-11-15 05:15:30 +11:00
85eaae7b4a
Merge pull request #5877 from phil235/SmokeRuntimeFix
...
Fixes the smoke runtime.
2014-11-14 18:09:19 +00:00
17607d0aa2
Merge pull request #5776 from MrPerson/throwing_changes
...
Throwing bugfixes
2014-11-14 18:04:00 +00:00
ec944abfc6
* limit atmos/fire alerts to the current z_level
...
* atmos/fire alerts are now linked to an object and not its area, as intended
* simplified and full pathed the radio frequency datum
* made radio objects properly clean on del/qdel, instead of letting the radio controller remove nulls at each post_signal()
2014-11-14 10:10:45 +01:00
ec6b2424d2
purge the unused
2014-11-13 21:10:53 -08:00
40cdf3ffec
swat mask overhauls and such
2014-11-13 18:36:30 -08:00
24456bcc22
Merge branch 'PipenetRevamp' of https://github.com/Aranclanos/-tg-station into Aranclanos-PipenetRevamp
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
code/ATMOSPHERICS/atmospherics.dm
code/ATMOSPHERICS/components/portables_connector.dm
2014-11-13 18:55:53 -06:00
fleure
Cheridan
Swag McYolosteinen
hornygranny
paprka
Razharas
Remie Richards
tkdrg
Steelpoint
Incoming
Jordie0608
Menshin
Cheridan