242ec7e54c
Merge pull request #5742 from Menshin/Maploader_fix
...
Maploader fix
2014-11-11 10:16:39 -06:00
ace3848ed8
Merge pull request #5801 from tkdrg/spessspeed
...
Speeds up space movement a little bit
2014-11-10 20:19:54 -08:00
d4a5d2ba1f
Merge pull request #5786 from Miauw62/runtime1
...
Fixes some RD console runtimes.
2014-11-10 08:43:10 -08:00
aa888ada65
Merge pull request #5753 from tkdrg/signalerruntime
...
Fixes #5604 signaler runtime
2014-11-10 08:20:10 -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
1cbfe107b5
Merge pull request #5751 from Miauw62/blugh
...
Fixes border window phasing.
2014-11-10 08:15:46 -08:00
9893fbc86f
Merge pull request #5645 from Ergovisavi/firefighting
...
Firefighting changes
2014-11-10 16:55:38 +01:00
5514f6f644
Merge pull request #5765 from tkdrg/reactconstruct
...
Adds check_shields() to attack_animal and friends
2014-11-09 21:19:21 -06:00
07fd45845a
Merge pull request #5655 from paprka/removingbullets
...
Last minute changes to guns for massive realism
2014-11-09 22:10:20 +00:00
481a282ca8
Adds NODROP to the Atmos watertank nozzle. I have no regrets.
2014-11-09 13:56:12 -08:00
170e9573fa
Speeds up space movement a little bit.
2014-11-09 17:37:01 -03: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
9b89f9160d
Adds mechfabricator_designs.dm, a file with all the default designs for the exosuit fabricator.
...
Updates the .dme file to add the new file.
2014-11-09 11:41:24 -03:00
28605093e2
Fixes some RD console runtimes. Fixed #5783
2014-11-09 13:59:25 +01:00
e392609b6f
Merge pull request #5425 from Menshin/meteor_redux
...
Meteors redux
2014-11-08 15:24:44 -08:00
9eb231be23
Merge pull request #5734 from paprka/removeborgnvg
...
Fixes borg mesons giving them pseudo night vision
2014-11-08 15:21:23 -08:00
71efbeef26
Merge pull request #5213 from Miauw62/whatthefuckareyouevensupposedtocallthesebranchesffs
...
Fixes whisper formatting hopefully maybe.
2014-11-08 15:12:59 -08:00
d15a44ca94
Merge pull request #5722 from Aranclanos/mechfabricators
...
Exosuit fabricator revamp
2014-11-08 15:10:58 -08:00
3f979d3aa1
Merge pull request #5695 from Aranclanos/lelerrocode
...
more VV logging and mass-modify proper admin-rights
2014-11-08 15:09:21 -08:00
d0d6947dad
Merge pull request #5719 from MrPerson/pls_dont_make_fun_of_the_singulo_shes_not_fat_just_big_boned
...
Singularity tweaks
2014-11-08 15:08:40 -08:00
28592a230e
Merge pull request #5737 from phil235/GrabbyPunchyFix
...
Adding a NOBLUDGEON check to simple_animal/attackby()
2014-11-08 15:07:18 -08:00
a394832f96
Adds check_shields() to attack_animal and friends
2014-11-08 19:16:54 -03:00
c724b54892
* Fixes meteors infinigibs and infinisplosions ( #5226 )
...
* Made meteors more threatening
* Added an ultra rare station buster Tunguska meteor
* Made admin-spawned meteor not instantly delete
* Added several types of meteor waves : normal, threatening, catastrophic which are randomly choose at wave start
* Meaty ores now spawn blood on tiles instead of busting them
* Differentiates regulars and reinforced girders ex_act
* Changelog included
2014-11-08 14:43:48 +01:00
99133d2020
Fixes #5604 signaler runtime
2014-11-08 10:09:19 -03:00
c275a9394d
Fixes being able to phase through windows using grabs. Fixed #3957
...
Fixes the supply shuttle safety applying when it is at centcomm. Fixed #3808
2014-11-08 13:21:55 +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
8adfff35af
Merge pull request #5732 from phil235/DisposalConstructionRuntimeFix
...
Fix Disposal pipe construction runtime.
2014-11-08 09:31:52 +01:00
53bf024dbe
Merge pull request #5545 from RemieRichards/DiseaseRework
...
Disease Code Partial Rework
2014-11-08 00:17:47 -06:00
a9d1963eb6
Merge pull request #5723 from Aranclanos/hideclown
...
Hiding the jumpsuit with HIDEJUMPSUIT exosuits
2014-11-07 23:58:33 -06:00
e49e4efe29
Merge pull request #5704 from phil235/TypoFix1
...
Fixes the ability to beat up a pAI.
2014-11-07 23:52:31 -06:00
9721c6fb6f
Merge pull request #5724 from Aranclanos/suicidestuff
...
Reworked a bit the suicide verb
2014-11-07 23:47:15 -06:00
efb3877fcf
Merge pull request #5682 from paprka/fixdefib
...
Defibrillator Hotfixes
2014-11-07 19:49:04 -08:00
e84beec0e2
more conflict fixes.
2014-11-08 01:22:27 +00: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
7974b77dfa
Merge pull request #5703 from phil235/AttackHandFix
...
Less copypasta in mob attack procs
2014-11-07 18:06:45 -06:00
2d04cbc39c
Fixing the merge conflicts.
2014-11-07 22:31:26 +01:00
1d96ef944d
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackHandFix
...
Conflicts:
code/game/machinery/turrets.dm
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
code/modules/mob/living/carbon/alien/larva/larva.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackalien.dm
code/modules/mob/living/carbon/human/human_attackpaw.dm
code/modules/mob/living/carbon/monkey/monkey.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/simple_animal/constructs.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2014-11-07 21:47:18 +01:00
b1a23de3da
Merge pull request #5696 from Aranclanos/gibber
...
Resist out of a gibber fix
2014-11-07 14:29:49 -06:00
594fd9d3e2
Merge pull request #5271 from Menshin/html_sanitization
...
Text input sanitization (take 1)
2014-11-07 13:56:20 -06:00
7f3040f708
Merge pull request #5697 from Aranclanos/AIemotes
...
AI emotes
2014-11-07 13:49:09 -06:00
8d0afc77fc
Adding a NOBLUDGEON check to simple_animal/attackby() so you can't hit them with NOBLUDGEON items like grabs or goliath_hide.
2014-11-07 19:59:01 +01:00
8a329bac6f
Merge pull request #5699 from MrStonedOne/MutiTask
...
Fixes player panel only allowing one window to be open at a time.
2014-11-07 10:46:55 -08:00
0914b1a7cd
Merge pull request #5642 from phil235/AttackAnimation
...
Adding an attack animation to most attacks
2014-11-07 18:39:27 +00:00
49fb9b057a
Fixes borg mesons giving them pseudo night vision
2014-11-07 09:24:43 -08:00
fc6358877f
Merge pull request #5698 from Aranclanos/overrideadminnotice
...
World message removal, admin panel override.
2014-11-07 10:31:38 -06:00
aa9873d7ff
Fix Disposal pipe construction runtime.
2014-11-07 17:12:16 +01:00
bc5754b378
adding diagonal attack animation.
2014-11-07 15:42:07 +01:00
d56698f991
Exosuit fabricator revamp
...
Exosuits will now use the designs from RnD to create objects instead of having the object already created on their contents.
Each one of the default items to build are now designs.
Removed access required to use the exosuit fabricators.
Removed an unused mech syringe gun design and replaced with a new one, with no cost.
Added a temporal object, /obj/item/mechavars, to be able to use initalize() for the construction time. This will be later on removed and the construction time will be ported to the design datums.
Some minors issues are still present, due to the amount of files needed to fix these, it won't be part of this commit, but a future one.
Fixes issue #3893
Removed required access to access the setting controls of the RnD console.
2014-11-06 23:45:16 -03:00
deb5884a19
Singularity tweaks
...
Fix an off-by-one error that caused the singulo to get stuck along contaiment fields. For a 5x5 singulo, it would check 6 squares ahead (correct for a step forward) and then 6 squares to the sides (incorrect). Now it tests 6 squares ahead, 5 to the sides. This is technically wrong for the growth checks but they check every direction anyways, so it's ok.
Made the singularity drift in all cases and not stop next to lattices.
In process(), moved the growth checks after the movement attempt so it will take a step and then grow rather than take a step, drift into the walls, and then attempt and fail to grow as part of the next process().
2014-11-06 16:41:21 -08:00
Cheridan
hornygranny
Swag McYolosteinen
Remie Richards
Ergovisavi
tkdrg
GunHog
Aranclanos
Menshin
phil235
paprka
MrPerson