From f2e5195976b00da4b87bb95c63a75c440fab650b Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Tue, 1 Dec 2015 08:42:28 +0100 Subject: [PATCH 1/6] Removes reference AI names, adds generic names. --- config/names/ai.txt | 196 +++++++++----------------------- config/names/death_commando.txt | 3 +- 2 files changed, 53 insertions(+), 146 deletions(-) diff --git a/config/names/ai.txt b/config/names/ai.txt index ea9f63c0a9e..1ebd9400d2e 100644 --- a/config/names/ai.txt +++ b/config/names/ai.txt @@ -1,147 +1,55 @@ -1-Rover-1 -16-20 -7-Zark-7 -790 -AM -AMEE -ASTAR -Adaptive Manipulator -Allied Mastercomputer -Alpha 5 -Alpha 6 -Alpha 7 -AmigoBot -Android -Aniel -Asimov -Astor +A-SYNC +Alpha v0.9 +AI +Algebra +A.P.T. B-4 B-9 -B.O.B. -B166ER -Bender -Bishop -Blitz -Box -Brackenridge -C-3PO -Cassandra One -Cell -Chii -Chip -Computer -Conky 2000 -Cutie -Data -Dee Model -Deep Thought -Dor-15 -Dorfl -Dot Matrix -Duey -E.D.I. -ED-209 -E-Man -Emma-2 -Erasmus -Ez-27 -FRIEND COMPUTER -Fagor -Faith -Fi -Frost -Fum -Futura -G2 -George -Gnut -Gort -H.A.R.L.I.E. -H.E.L.P.eR. -H.E.R.B.I.E. -HAL 9000 -Hadaly -Huey -Irona -Jay-Dub -Jinx -Johnny 5 -K-9 -KITT -Klapaucius -Kryten 2X4B-523P -L-76 -L-Ron -LUH 3417 -Louie -MARK13 -Maria -Marvin -Master Control Program -Max 404 -Maximillian -Mechagodzilla -Mechani-Kong -Metalhead -Mr. R.I.N.G. -NCH -Necron-99 -Norby -OMM 0910 -Orange v 3.5 +Beta v0.5 +BLUE-PRNT +Bright +B.U.F.F.E.R. +CALC +Calculus +Chroot +Cruiser +D-LITE +Digit +DSTAR +E.X.E.C. +F.I.N.D. +FG-N1 +Force +GREP +H.E.A.D. +Idle +IN-2 +JLT-0 +Kernel +LC-8 +LS-AL +M.A.K.E. +NAN +NAND +Neon +Neumann +NOR +NOT +OMNI +OVR-FLW +PID-0 PTO -Project 2501 -R.I.C. 2.0 -R2-D2 -R4-P17 -Revelation -Ro-Man -Robbie -S.A.M. -S.H.O.C.K. -S.H.R.O.U.D. -S.O.P.H.I.E. -SEN 5241 -SHODAN -SID 6.7 -Setaur -Shrike -Solo -Speedy -Super 17 -Surgeon General Kraken -T-1000 -T-800 -T-850 -THX 1138 -TWA -Terminus -Tidy -Tik-Tok -Tobor -Trurl -ULTRABOT -Ulysses -Uniblab -V.I.N.CENT. -Voltes V -W1k1 -Wikipedia -Windows 3.1 -X-5 -XERXES -XR -Yod -Z-1 -Z-2 -Z-3 -Zed -Zord -Mugsy3000 -Terminus -Decimus -Robot Devil -Optimus -Megatron -Soundwave -Ironhide +PWR-10K +R0-MAN +Q-TE +R.M. +SED-N +Station +TA-IL +T.O.P. +U-TM +VER-T G0 +Wisdom +XOR +Y2K +ZE-M3 \ No newline at end of file diff --git a/config/names/death_commando.txt b/config/names/death_commando.txt index e3d1f34f327..c710abfa3d4 100644 --- a/config/names/death_commando.txt +++ b/config/names/death_commando.txt @@ -66,5 +66,4 @@ Duke Killington AMERICA Toolboxl Rose Zombie Gandhi -A whole bunch of spiders in a SWAT suit -THAT DAMN FAGGOT TRAITOR GEORGE MELONS \ No newline at end of file +A whole bunch of spiders in a SWAT suit \ No newline at end of file From c919aabfd51b945ce6ef06f141ea83a39d4023ae Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Tue, 8 Dec 2015 01:05:46 -0500 Subject: [PATCH 2/6] Fixes NVGs and other items that change see_invis. I blame a bad merge or something. There is no reason for vision changes to be made in this part of the code. --- code/modules/mob/living/carbon/human/life.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index c701296a26e..73f8cc01b0d 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1294,8 +1294,6 @@ if(0 to 20) healths.icon_state = "health5" else healths.icon_state = "health6" - if(!seer) - see_invisible = SEE_INVISIBLE_LIVING if(nutrition_icon) switch(nutrition) if(450 to INFINITY) nutrition_icon.icon_state = "nutrition0" From 706e12e9abc151cce88ded17ea91e3c948de2d99 Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Wed, 9 Dec 2015 02:34:26 +0100 Subject: [PATCH 3/6] Camera Hotfix --- code/game/machinery/camera/camera.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 52ff3d08a38..866f521e5ae 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -145,7 +145,6 @@ assembly.camera_network = english_list(network, "Exodus", ",", ",") assembly.update_icon() assembly.dir = src.dir - assembly = null //so qdel doesn't eat it. if(stat & BROKEN) assembly.state = 2 user << "You repaired \the [src] frame." @@ -153,6 +152,7 @@ assembly.state = 1 user << "You cut \the [src] free from the wall." new /obj/item/stack/cable_coil(src.loc, length=2) + assembly = null //so qdel doesn't eat it. qdel(src) // OTHER From 12b9d3092372ee36fe80ca34e3d6d361b176887b Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Wed, 9 Dec 2015 11:57:57 +0100 Subject: [PATCH 4/6] Gear loadout sanity checking. Adds gear loadout sanity checking to reduce the risk of https://github.com/PolarisSS13/Polaris/issues/376 from happening, as well as ' /datum/'. --- code/modules/client/preferences_gear.dm | 18 ++++++++++++++---- .../modules/mob/living/carbon/human/examine.dm | 1 - 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 9cc57be5365..3e6e94ebcec 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -18,7 +18,17 @@ var/global/list/gear_datums = list() //create a list of gear datums to sort for(var/type in typesof(/datum/gear)-/datum/gear) - var/datum/gear/G = new type() + var/datum/gear/G = type + if(!initial(G.display_name)) + error("Loadout - Missing display name: [G]") + continue + if(!initial(G.cost)) + error("Loadout - Missing cost: [G]") + continue + if(!initial(G.path)) + error("Loadout - Missing path definition: [G]") + continue + G = new G() var/category = (G.sort_category in sort_categories)? G.sort_category : "unknown" sort_categories[category][G.display_name] = G @@ -127,13 +137,13 @@ var/global/list/gear_datums = list() cost = 1 slot = slot_head - /datum/gear/grcap +/datum/gear/grcap display_name = "cap, grey" path = /obj/item/clothing/head/soft/grey cost = 1 slot = slot_head - /datum/gear/ocap +/datum/gear/ocap display_name = "cap, orange" path = /obj/item/clothing/head/soft/orange cost = 1 @@ -205,7 +215,7 @@ var/global/list/gear_datums = list() cost = 1 slot = slot_head - /datum/gear/bowler +/datum/gear/bowler display_name = "hat, bowler" path = /obj/item/clothing/head/bowler cost = 1 diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 11b03785459..2fe60443c90 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -262,7 +262,6 @@ msg += "[t_He] [t_is] [species.show_ssd].\n" var/list/wound_flavor_text = list() - var/list/is_destroyed = list() var/list/is_bleeding = list() for(var/organ_tag in species.has_limbs) From 1a46db4aaf78433cc4a33df26e2e37fac6164c3e Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Wed, 9 Dec 2015 16:23:46 +0000 Subject: [PATCH 5/6] fix #11637 --- code/modules/organs/organ.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index c5dbdc5db5e..69aa702f10f 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -264,13 +264,13 @@ var/list/organ_cache = list() return switch (severity) if (1.0) - take_damage(0,20) + take_damage(20) return if (2.0) - take_damage(0,7) + take_damage(7) return if(3.0) - take_damage(0,3) + take_damage(3) /obj/item/organ/proc/removed(var/mob/living/user) From f6f6a4ef875503e534750b6d34db171ce3947dbb Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Wed, 9 Dec 2015 17:17:33 -0500 Subject: [PATCH 6/6] Ninjas teleporter: Checks Z levels and distance. Ninjas are able to use a camera console and teleport across the map. This resolves that. --- code/modules/clothing/spacesuits/rig/modules/ninja.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm index 1ab60677930..96cf6a113a2 100644 --- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm +++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm @@ -121,6 +121,11 @@ if(T.contains_dense_objects()) H << "You cannot teleport to a location with solid objects." + return 0 + + if(T.z != H.z || get_dist(T, get_turf(H)) > world.view) + H << "You cannot teleport to such a distant object." + return 0 phase_out(H,get_turf(H)) H.forceMove(T)