cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-30 03:53:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Browse Source 
Conflicts:
	maps/tgstation.2.0.8.dmm
This commit is contained in:
Erthilo
2012-06-08 20:19:27 +01:00
parent 3f40c0ad60 0cc2d20a33
commit 54ec9bdd84
49 changed files with 7520 additions and 7304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/admin/verbs/debug.dm
View File

@@ -98,7 +98,21 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
lst[i] = input("Enter type:","Type") in typesof(/obj,/mob,/area,/turf)
if("reference")
lst[i] = input("Select reference:","Reference",src) as mob|obj|turf|area in world
switch(alert("Would you like to enter a specific object, or search for it from the world?","Choose!","Specifc UID (Hexadecimal number)", "Search"))
if("Specifc UID (Hexadecimal number)")
var/UID = input("Type in UID, without the leading 0x","Type in UID") as text|null
if(!UID) return
var/temp_variable = locate("\[0x[UID]\]")
if(!temp_variable)
usr << "ERROR. Could not locate referenced object."
return
switch(alert("You have chosen [temp_variable], in [get_area(temp_variable)]. Are you sure?","You sure?","Yes","NONOCANCEL!"))
if("Yes")
lst[i] = temp_variable
if("NONOCANCEL!")
return
if("Search")
lst[i] = input("Select reference:","Reference") as null|mob|obj|turf|area in world
if("mob reference")
lst[i] = input("Select reference:","Reference",usr) as mob in world
@@ -171,8 +185,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if("Specifc UID (Hexadecimal number)")
var/UID = input("Type in UID, without the leading 0x","Type in UID") as text|null
if(!UID) return
if(length(UID) != 7)
usr << "ERROR. UID must be 7 digits"
var/temp_variable = locate("\[0x[UID]\]")
if(!temp_variable)
usr << "ERROR. Could not locate referenced object."
@@ -239,8 +251,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if("Specifc UID (Hexadecimal number)")
var/UID = input("Type in UID, without the leading 0x","Type in UID") as text|null
if(!UID) return
if(length(UID) != 7)
usr << "ERROR. UID must be 7 digits"
var/temp_variable = locate("\[0x[UID]\]")
if(!temp_variable)
usr << "ERROR. Could not locate referenced object."

8
code/modules/admin/verbs/modifyvariables.dm
View File

@@ -66,8 +66,6 @@ var/list/forbidden_varedit_object_types = list(
if("Specifc UID (Hexadecimal number)")
var/UID = input("Type in UID, without the leading 0x","Type in UID") as text|null
if(!UID) return
if(length(UID) != 7)
usr << "ERROR. UID must be 7 digits"
var/temp_variable = locate("\[0x[UID]\]")
if(!temp_variable)
usr << "ERROR. Could not locate referenced object."
@@ -131,8 +129,6 @@ var/list/forbidden_varedit_object_types = list(
if("Specifc UID (Hexadecimal number)")
var/UID = input("Type in UID, without the leading 0x","Type in UID") as text|null
if(!UID) return
if(length(UID) != 7)
usr << "ERROR. UID must be 7 digits"
var/temp_variable = locate("\[0x[UID]\]")
if(!temp_variable)
usr << "ERROR. Could not locate referenced object."
@@ -308,8 +304,6 @@ var/list/forbidden_varedit_object_types = list(
if("Specifc UID (Hexadecimal number)")
var/UID = input("Type in UID, without the leading 0x","Type in UID") as null|text
if(!UID) return
if(length(UID) != 7)
usr << "ERROR. UID must be 7 digits"
var/temp_variable = locate("\[0x[UID]\]")
if(!temp_variable)
usr << "ERROR. Could not locate referenced object."
@@ -554,8 +548,6 @@ var/list/forbidden_varedit_object_types = list(
if("Specifc UID (Hexadecimal number)")
var/UID = input("Type in UID, without the leading 0x","Type in UID") as text|null
if(!UID) return
if(length(UID) != 7)
usr << "ERROR. UID must be 7 digits"
var/temp_variable = locate("\[0x[UID]\]")
if(!temp_variable)
usr << "ERROR. Could not locate referenced object."

30
code/modules/chemical/Chemistry-Reagents.dm
View File

@@ -524,14 +524,14 @@ datum
src = null
var/turf/the_turf = get_turf(O)
var/datum/gas_mixture/napalm = new
napalm.oxygen = volume*10
napalm.oxygen = volume/10
napalm.temperature = T0C
napalm.update_values()
the_turf.assume_air(napalm)
reaction_turf(var/turf/T, var/volume)
src = null
var/datum/gas_mixture/napalm = new
napalm.oxygen = volume*10
napalm.oxygen = volume/10
napalm.temperature = T0C
napalm.update_values()
T.assume_air(napalm)
@@ -554,14 +554,14 @@ datum
src = null
var/turf/the_turf = get_turf(O)
var/datum/gas_mixture/napalm = new
napalm.nitrogen = volume*10
napalm.nitrogen = volume/10
napalm.temperature = T0C
napalm.update_values()
the_turf.assume_air(napalm)
reaction_turf(var/turf/T, var/volume)
src = null
var/datum/gas_mixture/napalm = new
napalm.nitrogen = volume*10
napalm.nitrogen = volume/10
napalm.temperature = T0C
napalm.update_values()
T.assume_air(napalm)
@@ -1036,18 +1036,10 @@ datum
var/turf/the_turf = get_turf(O)
if(!the_turf)
return //No sense trying to start a fire if you don't have a turf to set on fire. --NEO
var/datum/gas_mixture/napalm = new
napalm.toxins = volume*10
napalm.temperature = T0C
napalm.update_values()
the_turf.assume_air(napalm)
new /obj/liquid_fuel(the_turf, volume)
reaction_turf(var/turf/T, var/volume)
src = null
var/datum/gas_mixture/napalm = new
napalm.toxins = volume*10
napalm.temperature = T0C
napalm.update_values()
T.assume_air(napalm)
new /obj/liquid_fuel(T, volume)
return
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -1155,19 +1147,17 @@ datum
src = null
var/turf/the_turf = get_turf(O)
var/datum/gas_mixture/napalm = new
var/datum/gas/volatile_fuel/fuel = new
fuel.moles = 5
napalm.trace_gases += fuel
napalm.toxins = volume/5
napalm.update_values()
the_turf.assume_air(napalm)
new /obj/liquid_fuel(the_turf, volume)
reaction_turf(var/turf/T, var/volume)
src = null
var/datum/gas_mixture/napalm = new
var/datum/gas/volatile_fuel/fuel = new
fuel.moles = 5
napalm.trace_gases += fuel
napalm.toxins = volume/5
napalm.update_values()
T.assume_air(napalm)
new /obj/liquid_fuel(T, volume)
return
leporazine

10
code/modules/customitems/item_defines.dm
View File

@@ -142,6 +142,16 @@
//////////// Clothing ////////////
//////////////////////////////////
//////////// Gloves ////////////
/obj/item/clothing/gloves/fluff/walter_brooks_1 //botanistpower: Walter Brooks
name = "mittens"
desc = "A pair of well worn, blue mittens."
icon = 'custom_items.dmi'
icon_state = "walter_brooks_1"
item_state = "bluegloves"
color="blue"
//////////// Eye Wear ////////////
/obj/item/clothing/glasses/meson/fluff/book_berner_1 //asanadas: Book Berner

1
code/modules/mob/dead/observer/observer.dm
View File

@@ -63,7 +63,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/proc/ghost()
set category = "Ghost"
set name = "Ghost"
set desc = "You cannot be revived as a ghost."
/*if(stat != 2) //this check causes nothing but troubles. Commented out for Nar-Sie's sake. --rastaf0
src << "Only dead people and admins get to ghost, and admins don't use this verb to ghost while alive."

15
code/modules/mob/living/carbon/human/human.dm
View File

@@ -486,8 +486,9 @@
head = null
if(prev_head && (prev_head.flags & BLOCKHAIR))
// rebuild face
del(face_standing)
del(face_lying)
// del(face_standing)
// del(face_lying)
update_face()
else if (W == l_ear)
l_ear = null
@@ -506,8 +507,9 @@
wear_mask = null
if(prev_mask && (prev_mask.flags & BLOCKHAIR))
// rebuild face
del(face_standing)
del(face_lying)
// del(face_standing)
// del(face_lying)
update_face()
else if (W == wear_id)
wear_id = null
@@ -1255,7 +1257,6 @@
// Should be called only when something about the clothing itself changed
// which is not handled by the equip code.
rebuild_appearance()
update_face() //Fixes hair not coming back after using a BLOCKHAIR mask/helmet
return
// TODO: once I have replaced the udpate_clothing() calls with update_lying() or
@@ -1770,6 +1771,8 @@ It can still be worn/put on as normal.
return
var/obj/item/clothing/W = target.wear_mask
target.u_equip(W)
if (W.flags & BLOCKHAIR)
target.update_face()
if (target.client)
target.client.screen -= W
if (W)
@@ -1899,6 +1902,8 @@ It can still be worn/put on as normal.
target.u_equip(W)
if (target.client)
target.client.screen -= W
if (W.flags & BLOCKHAIR)
target.update_face()
if (W)
W.loc = target.loc
W.dropped(target)

4
code/modules/mob/living/silicon/ai/ai.dm
View File

@@ -123,6 +123,8 @@
var/list/icons = list("Blue", "Monochrome", "Rainbow", "Inverted", "Firewall", "Green", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss", "Red", "Static")
if (src.name == "B.A.N.N.E.D." && src.ckey == "spaceman96")
icons += "B.A.N.N.E.D."
if (src.name == "M00X-BC" && src.ckey == "searif")
icons += "M00X-BC"
icontype = input("Please, select a display!", "AI", null/*, null*/) in icons
if(icontype == "Blue")
icon_state = "ai"
@@ -148,6 +150,8 @@
icon_state = "ai-bliss"
else if(icontype == "B.A.N.N.E.D.")
icon_state = "ai-banned"
else if(icontype == "M00X-BC")
icon_state = "ai-searif"
else if(icontype == "Red")
icon_state = "ai-malf"
else if(icontype == "Static")

2
code/modules/power/power.dm
View File

@@ -82,7 +82,6 @@
for(var/L = 1 to netcount)
var/datum/powernet/PN = new()
//PN.tag = "powernet #[L]"
powernets += PN
PN.number = L
@@ -287,7 +286,6 @@
// not looped, so make a new powernet
var/datum/powernet/PN = new()
//PN.tag = "powernet #[L]"
powernets += PN
PN.number = powernets.len

2
code/modules/projectiles/guns/energy/stun.dm
View File

@@ -69,7 +69,7 @@
/obj/item/weapon/gun/energy/crossbow
name = "mini energy-crossbow"
desc = "A weapon favored by many of the syndicates stealth specialists."
desc = "A crossbow that doesn't seem to have space for bolts."
icon_state = "crossbow"
w_class = 2.0
item_state = "crossbow"