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
2f55abfa50
Merge pull request #5837 from paprka/infiniracks
...
Fixes rack dupe exploit
2014-11-13 17:19:26 -06:00
38eeca2ebd
Merge pull request #5644 from Jordie0608/beekeepermodewhen
...
Adds bee swarms and butterflies and diseases to create them
2014-11-13 17:04:29 -06:00
d2d2d162ba
Third time's the charm.
2014-11-13 19:39:37 +01:00
a73d22f2ed
Actually fixes the runtime this time.
2014-11-13 19:22:22 +01:00
e2a213879f
Fixes the flashbang runtime.
2014-11-13 18:31:42 +01:00
2340caa309
Fixes drones cutting their hands when using shards.
2014-11-13 17:54:41 +01:00
a248a1a4db
Conflicts:
...
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-11-13 17:33:32 +01:00
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
a2f23f2cef
Fixes the smoke runtime.
2014-11-13 17:11:06 +01:00
85d879fbf4
Removes brute damage from tabling
2014-11-12 19:54:33 -08:00
020d28fe3b
fixes a few glass table related bugs and adds more fun
2014-11-12 18:48:01 -08:00
606bd332d3
fixed broken commits
2014-11-12 17:54:08 -08:00
ed4c03b099
Floor cleanup: Repaths /turf/simulated/floor to /turf/simulated/floor/plasteel
...
Repaths carpet and grass to /turf/simulated/floor/fancy/carpet and /turf/simulated/floor/fancy/grass
Cleans up a few floor procs
2014-11-12 22:50:32 -03:00
8e419ca8f9
possible fix
2014-11-12 17:48:54 -08:00
fe94f9cab0
Fixes a bunch of capitalization inconsistencies, adds names to vendors
2014-11-12 15:37:21 -08:00
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
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
1d2fac2162
Resisting out of a closet no longer fails when locker is moved.
2014-11-12 18:06:39 +01:00
65ba4f9764
Fixes the mouth washing message and the cleaning message appearing at the same time.
...
Lets monkeys wash a human's mouth.
2014-11-12 17:37:27 +01:00
b0d5e1b836
Fixes the lack of attack animation when using the stun baton on "on" and with intent other than harm.
2014-11-12 15:22:06 +01:00
6dfc9bbaac
Lasers can now go through transit tubes
2014-11-11 21:46:36 -03:00
56316c6129
bad placement for this particular line
2014-11-11 16:37:47 -08:00
da5cd74d53
fixes rack dupe exploit
2014-11-11 16:31:50 -08:00
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
3fb5d14468
Merge branch 'master' of https://github.com/tgstation/-tg-station into EATITFATTY
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
2014-11-10 11:43:46 -08:00
613b450ac7
Better equip code
2014-11-10 19:25:58 +00:00
0b0dba724a
Added better nozzle deletion and removed qdel check
2014-11-10 19:09:34 +00:00
ad27bc5200
Added GC check
2014-11-10 18:48:48 +00:00
c0d858dccf
Fixes nozzle deleting and adds some safety to nozzle toggling
2014-11-10 17:48:37 +00:00
d39265bb55
Merge pull request #5717 from phil235/FireaxecabinetBulletFix
...
Fireaxecabinet bullet fix
2014-11-10 08:22:38 -08:00
7ce90ff54a
Merge pull request #5654 from GunHog/Potato_AI_Wants_To_Hear_You_Scream_Too
...
Gives Traitor AIs the Syndicate Channel!
2014-11-10 17:18:04 +01:00
fa735ea9ed
Merge pull request #5768 from paprka/mophands
...
Fixes no inhand for advanced mop
2014-11-10 08:16:22 -08:00
9893fbc86f
Merge pull request #5645 from Ergovisavi/firefighting
...
Firefighting changes
2014-11-10 16:55:38 +01:00
cdd5128d47
Removed hilarious but useless sleep() in closets/boxes New()
2014-11-10 01:59:32 +01:00
9af72bda1f
compile fixes
2014-11-09 15:01:46 -08:00
0ffba02112
Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables
...
Conflicts:
_maps/map_files/MetaStation.v39K.dmm
_maps/map_files/tgstation.2.1.3.dmm
code/game/objects/structures/tables_racks.dm
2014-11-09 14:53:19 -08:00
481a282ca8
Adds NODROP to the Atmos watertank nozzle. I have no regrets.
2014-11-09 13:56:12 -08:00
32e9cd70c4
maskes
2014-11-09 13:46:30 -08:00
2c74fc8dbb
-Adds secure atmos closets to Atmos
...
-Removes a redundant check in water's obj reaction, add's a "cooling power" var that determines how effective it is at cooling off hotspots
-Modifies extinguishers a bit to have more options, affect more tiles, change the cooling temperature of the water inside of it, etc
-Makes the water backpack for atmos even more robust at fighting fires with a 5 tile spread, removes converting oxygen to nitrogen on Nanofrost, made the resulting end of a firefight annoying as the atmos tech would have to get an oxygen canister
-Makes racks use Move() to put objects on top of them instead of just changing the loc, in order to stop nozzles/misters from getting on them
2014-11-09 11:16:58 -08:00
4bc6ded418
Merge remote-tracking branch 'remotes/upstream/master' into Potato_AI_Wants_To_Hear_You_Scream_Too
...
Conflicts:
code/modules/mob/living/silicon/ai/ai.dm
2014-11-09 12:27:48 -06:00
e02e2f5c0b
TearGas
2014-11-10 02:16:46 +08:00
fb0aa31682
Merge branch 'master' of https://github.com/tgstation/-tg-station into newhosjumpsuit
...
Conflicts:
icons/mob/head.dmi
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2014-11-09 15:29:32 +01:00
c159878ace
Throwing bugfixes
...
Removed an unused client verb, changed a usr to src where they're the same mob, and changed a type == check to istype().
Allow turning on throw mode when clicking the UI button (hotkeys already allow you to do this).
Disallow throwing when not on a turf.
Fixes #4823
Make storage items close out the onscreen stuff when they get thrown.
Fixes #5296
2014-11-09 00:29:20 -08:00
9be60df479
fixes no inhand for mop
2014-11-08 19:28:13 -08:00
86d0422881
Merge pull request #5739 from hornygranny/lattices
...
lattice and grille deconstruction refactor
2014-11-08 21:21:53 -06:00
e392609b6f
Merge pull request #5425 from Menshin/meteor_redux
...
Meteors redux
2014-11-08 15:24:44 -08:00
62003a8ab8
Merge pull request #5700 from RemieRichards/SiliconLawCap
...
Adds a config option to cap silicon laws. [NEW CONFIG OPTION]
2014-11-08 15:22:09 -08:00
4ff8507c85
Merge pull request #5727 from phil235/RecorderFix
...
Fixes the tape recorder. (one typo)
2014-11-08 15:07:47 -08:00
8f855bf49a
Fixes the torch and flare icons, especially the "on" inhand icons.
2014-11-08 16:14:19 +01:00
Cheridan
Cheridan
phil235
paprka
paprka
Intigracy
tkdrg
hornygranny
fleure
Swag McYolosteinen
Menshin
Ergovisavi
GunHog
Steelpoint
MrPerson