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
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
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
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
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
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
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
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
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
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
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
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
9c1366d65f
Adds a new define for temperature protection for more robust firefighting gear
...
Adds Atmos Firesuits, Atmos Firesuit Helmets, sprites for all the firefighting gear etc
2014-11-08 02:14:37 -08:00
53bf024dbe
Merge pull request #5545 from RemieRichards/DiseaseRework
...
Disease Code Partial Rework
2014-11-08 00:17:47 -06:00
15b16e1f67
Merge pull request #5726 from paprka/traitorbeltthing
...
Adds disguised med analyzer to medibelts
2014-11-07 23:39:56 -06:00
efb3877fcf
Merge pull request #5682 from paprka/fixdefib
...
Defibrillator Hotfixes
2014-11-07 19:49:04 -08:00
2054cbda08
Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/human/human_attackpaw.dm
code/modules/mob/living/carbon/monkey/monkey.dm
2014-11-08 01:07:29 +00:00
7bde69c3a7
emagged defibs now make people gasp
2014-11-07 16:17:58 -08:00
774e82de06
Buffed weaken of safety off defibs and removed burn damage
2014-11-07 16:17:11 -08:00
594fd9d3e2
Merge pull request #5271 from Menshin/html_sanitization
...
Text input sanitization (take 1)
2014-11-07 13:56:20 -06:00
e2bf3eca4b
Merge pull request #5705 from Donkie/batonfix
...
Fixes #5691 - Batons incorrectly giving messages
2014-11-07 10:27:09 -06:00
3f16a966b2
Merge pull request #5712 from xxalpha/amilli
...
Increases gold content per Robust Gold cigarette to 1
2014-11-07 10:09:54 -06:00
669a20df77
Merge pull request #5708 from paprka/stupidfuckup
...
Fixes utility medipen bundle for miners
2014-11-07 10:03:46 -06:00
7ca1c48206
Fix the tape recorder.
2014-11-07 10:52:52 +01:00
e5db75d756
adds disguised med analyzer to medibelts
2014-11-06 21:36:54 -08:00
e1a06faa9b
Increases gold content per Robust Gold cigarette to 1
2014-11-06 18:23:48 +00:00
b99499e277
fixes utility medipen bundle for miners
2014-11-05 18:02:14 -08:00
059244387f
Fixed #5691
2014-11-06 01:12:15 +01:00
d1e0ef943c
Changes messages to be more appropriate for last commit + more fluffy.
2014-11-05 23:31:51 +00:00
198b9fee93
Extends the check to include the number of potential laws, from the current aiModule (eg, total_laws (10) + potential laws on board (4) = 14, 14 > 12)
2014-11-05 23:07:24 +00:00
177225598b
Adds a config option for capping the amount of laws silicons can receive via boards, defaults to 12
2014-11-05 22:25:46 +00:00
Remie Richards
Menshin
phil235
Intigracy
tkdrg
paprka
hornygranny
fleure
Swag McYolosteinen
Menshin
Ergovisavi
GunHog
Steelpoint
MrPerson
Cheridan
xxalpha
Daniel