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
1cbfe107b5
Merge pull request #5751 from Miauw62/blugh
...
Fixes border window phasing.
2014-11-10 08:15:46 -08:00
5428ed7d5d
Merge pull request #5749 from Miauw62/vov
...
Fixes an edge case where clones could talk, take 2.
2014-11-10 08:15:33 -08:00
9893fbc86f
Merge pull request #5645 from Ergovisavi/firefighting
...
Firefighting changes
2014-11-10 16:55:38 +01:00
1b6b7d0d94
Merge pull request #5624 from paprka/glasstables
...
[MAP] Table construction overhaul
2014-11-09 21:37:10 -06: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
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
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
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
04c5e33f1c
Merge pull request #5576 from GunHog/Rapid_Part_Exchange_And_Installation_Device
...
RPED Expansion
2014-11-09 00:59:57 -06:00
dd7bfbff59
Adds a sound for the RPED!
...
When used to exchange or install parts, the RPED will play a cool
machiney sound! Sound by Cuboos.
2014-11-08 23:49:04 -06: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
3d6f946bcf
Merge remote-tracking branch 'remotes/upstream/master' into Rapid_Part_Exchange_And_Installation_Device
...
Conflicts:
code/defines/obj/weapon.dm
2014-11-08 19:16:49 -06:00
e859375d3e
RPED Installation Complete Fix + Circuit changes
...
- The RPED now sorts its parts when installing new equipment - It will
always use the best parts contained within.
- Made all the req_component lists of circuitboards actual paths instead
of pure text. Hopefully I fixed everything that broke when I did that.
2014-11-08 19:11:04 -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
9eb231be23
Merge pull request #5734 from paprka/removeborgnvg
...
Fixes borg mesons giving them pseudo night vision
2014-11-08 15:21:23 -08:00
3a316dc233
Merge pull request #5111 from Perakp/removeAbsorbObjective
...
Remove absorb objective and other changes to changeling
2014-11-08 15:18:44 -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
4ff8507c85
Merge pull request #5727 from phil235/RecorderFix
...
Fixes the tape recorder. (one typo)
2014-11-08 15:07:47 -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
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
53aeeb2107
Fixes an edge case where clones could talk, take 2. Fixes #5256
2014-11-08 10:55:10 +01:00
8adfff35af
Merge pull request #5732 from phil235/DisposalConstructionRuntimeFix
...
Fix Disposal pipe construction runtime.
2014-11-08 09:31:52 +01:00
cf3525aa46
Merge pull request #5693 from Aranclanos/LINDAISAGODESS
...
Roundstart turfs next to space deactivated (LINDA) fix
2014-11-08 00:48:23 -06:00
53bf024dbe
Merge pull request #5545 from RemieRichards/DiseaseRework
...
Disease Code Partial Rework
2014-11-08 00:17:47 -06:00
3731747d11
Remembers to remove code/datums/disease.dm , code/datums/disease/_disease.dm replace it.
2014-11-08 06:12:22 +00: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
78e73986d4
Merge pull request #5714 from phil235/WindoorFireballFix
...
Adding an ex_act() proc to windoors
2014-11-07 23:49:47 -06:00
9721c6fb6f
Merge pull request #5724 from Aranclanos/suicidestuff
...
Reworked a bit the suicide verb
2014-11-07 23:47:15 -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
3854ab4763
Merge pull request #5707 from Donkie/closetbudgefix
...
Fixed #3752 It won't budge!!!11
2014-11-07 20:08:38 -06: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
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
Swag McYolosteinen
hornygranny
Cheridan
paprka
Remie Richards
Ergovisavi
GunHog
Aranclanos
tkdrg
Menshin