cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 00:53:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Browse Source 
Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
This commit is contained in:
Chinsky
2013-06-08 05:55:42 +04:00
parent 9a930d0c50 76d1ddaa26
commit e40140be03
12 changed files with 250 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ZAS/Functions.dm
+5 -2
View File
@@ -110,7 +110,10 @@ proc/ZMerge(zone/A,zone/B)
C.Cleanup()
//Add space tiles.
A.unsimulated_tiles |= B.unsimulated_tiles
if(A.unsimulated_tiles && B.unsimulated_tiles)
A.unsimulated_tiles |= B.unsimulated_tiles
else if (B.unsimulated_tiles)
A.unsimulated_tiles = B.unsimulated_tiles
//Add contents.
A.contents = new_contents
@@ -150,4 +153,4 @@ proc/ZConnect(turf/simulated/A,turf/simulated/B)
return
//Make the connection.
new /connection(A,B)
new /connection(A,B)
code/game/gamemodes/cult/runes.dm
+1 -1
View File
@@ -115,7 +115,7 @@ var/list/sacrificed = list()
return 1
else
M << "<font color=\"purple\"><b><i>Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.</b></i></font>"
M << "<font color=\"red\"><b>And not a single fuck was given, exterminate the cult at all costs.</b></font>"
M << "<font color=\"red\"><b>And you were able to force it out of your mind. You now know the truth, there's something horrible out there, stop it and its minions at all costs.</b></font>"
return 0
return fizzle()
code/game/machinery/doors/firedoor.dm
+7
View File
@@ -57,6 +57,13 @@
return
if(!density)
return ..()
if(istype(AM, /obj/mecha))
var/obj/mecha/mecha = AM
if (mecha.occupant)
var/mob/M = mecha.occupant
if(world.time - M.last_bumped <= 10) return //Can bump-open one airlock per second. This is to prevent popup message spam.
M.last_bumped = world.time
attack_hand(M)
return 0
code/game/objects/items/devices/PDA/PDA.dm
+1 -1
View File
@@ -23,7 +23,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
//Secondary variables
var/scanmode = 0 //1 is medical scanner, 2 is forensics, 3 is reagent scanner.
var/fon = 0 //Is the flashlight function on?
var/f_lum = 4 //Luminosity for the flashlight function
var/f_lum = 2 //Luminosity for the flashlight function
var/silent = 0 //To beep or not to beep, that is the question
var/toff = 0 //If 1, messenger disabled
var/tnote = null //Current Texts
code/game/objects/items/weapons/storage/belt.dm
+1
View File
@@ -108,6 +108,7 @@
item_state = "security"//Could likely use a better one.
storage_slots = 7
max_w_class = 3
max_combined_w_class = 21
can_hold = list(
"/obj/item/weapon/grenade/flashbang",
"/obj/item/weapon/reagent_containers/spray/pepper",
code/modules/mob/living/silicon/ai/ai.dm
+4
View File
@@ -133,6 +133,8 @@ var/list/ai_list = list()
icons += "M00X-BC"
if (src.name == "Skuld" && src.ckey == "ravensdale")
icons += "Skuld"
if (src.name == "REMNANT" && src.ckey == "serithi")
icons += "REMNANT"
icontype = input("Please, select a display!", "AI", null/*, null*/) in icons
if(icontype == "Clown")
icon_state = "ai-clown2"
@@ -170,6 +172,8 @@ var/list/ai_list = list()
icon_state = "ai-triumvirate-malf"
else if(icontype == "Skuld")
icon_state = "ai-ravensdale"
else if(icontype == "REMNANT")
icon_state = "ai-serithi"
//else
//usr <<"You can only change your display once!"
//return
code/modules/mob/living/silicon/ai/death.dm
+2
View File
@@ -3,6 +3,8 @@
stat = DEAD
if (src.name == "Skuld" && src.ckey == "ravensdale")//checks ID of AI and player to see if it needs to pull the custom death sprite and goes to blue-screen if it doesn't
icon_state = "ai-ravensdale-crash"
else if (src.name == "REMNANT" && src.ckey == "serithi")
icon_state = "ai-serithi-crash"
else icon_state = "ai-crash"
update_canmove()
if(src.eyeobj)
code/modules/mob/living/silicon/robot/robot.dm
+29 -8
View File
@@ -123,9 +123,12 @@
updatename(mod)
module = new /obj/item/weapon/robot_module/standard(src)
hands.icon_state = "standard"
var/icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Standard")
var/icontype
if (src.name == "Lucy" && src.ckey == "rowtree") icontype = ("Lucy")
else icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Standard")
switch(icontype)
if("Basic") icon_state = "robot_old"
if("Lucy") icon_state = "rowtree-lucy"
else icon_state = "robot"
modtype = "Stand"
feedback_inc("cyborg_standard",1)
@@ -134,12 +137,15 @@
updatename(mod)
module = new /obj/item/weapon/robot_module/butler(src)
hands.icon_state = "service"
var/icontype = input("Select an icon!", "Robot", null, null) in list("Waitress", "Bro", "Butler", "Kent", "Rich")
var/icontype
if (src.name == "Lucy" && src.ckey == "rowtree") icontype = ("Lucy")
else icontype = input("Select an icon!", "Robot", null, null) in list("Waitress", "Bro", "Butler", "Kent", "Rich")
switch(icontype)
if("Waitress") icon_state = "Service"
if("Kent") icon_state = "toiletbot"
if("Bro") icon_state = "Brobot"
if("Rich") icon_state = "maximillion"
if("Lucy") icon_state = "rowtree-lucy"
else icon_state = "Service2"
modtype = "Butler"
feedback_inc("cyborg_service",1)
@@ -148,10 +154,13 @@
updatename(mod)
module = new /obj/item/weapon/robot_module/miner(src)
hands.icon_state = "miner"
var/icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Advanced Droid", "Treadhead")
var/icontype
if (src.name == "Lucy" && src.ckey == "rowtree") icontype = ("Lucy")
else icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Advanced Droid", "Treadhead")
switch(icontype)
if("Basic") icon_state = "Miner_old"
if("Advanced Droid") icon_state = "droid-miner"
if("Lucy") icon_state = "rowtree-lucy"
else icon_state = "Miner"
modtype = "Miner"
feedback_inc("cyborg_miner",1)
@@ -161,11 +170,14 @@
updatename(mod)
module = new /obj/item/weapon/robot_module/medical(src)
hands.icon_state = "medical"
var/icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Advanced Droid", "Needles", "Hoverbot")
var/icontype
if (src.name == "Lucy" && src.ckey == "rowtree") icontype = ("Lucy")
else icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Advanced Droid", "Needles", "Hoverbot")
switch(icontype)
if("Basic") icon_state = "Medbot"
if("Advanced Droid") icon_state = "droid-medical"
if("Needles") icon_state = "medicalrobot"
if("Lucy") icon_state = "rowtree-medical"
else icon_state = "surgeon"
modtype = "Med"
status_flags &= ~CANPUSH
@@ -176,11 +188,14 @@
updatename(mod)
module = new /obj/item/weapon/robot_module/security(src)
hands.icon_state = "security"
var/icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Red Knight", "Black Knight", "Bloodhound")
var/icontype
if (src.name == "Lucy" && src.ckey == "rowtree") icontype = ("Lucy")
else icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Red Knight", "Black Knight", "Bloodhound")
switch(icontype)
if("Basic") icon_state = "secborg"
if("Red Knight") icon_state = "Security"
if("Black Knight") icon_state = "securityrobot"
if("Lucy") icon_state = "rowtree-security"
else icon_state = "bloodhound"
modtype = "Sec"
//speed = -1 Secborgs have nerfed tasers now, so the speed boost is not necessary
@@ -192,10 +207,13 @@
updatename(mod)
module = new /obj/item/weapon/robot_module/engineering(src)
hands.icon_state = "engineer"
var/icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Antique", "Landmate")
var/icontype
if (src.name == "Lucy" && src.ckey == "rowtree") icontype = ("Lucy")
else icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Antique", "Landmate")
switch(icontype)
if("Basic") icon_state = "Engineering"
if("Antique") icon_state = "Engineerrobot"
if("Antique") icon_state = "engineerrobot"
if("Lucy") icon_state = "rowtree-engineering"
else icon_state = "landmate"
modtype = "Eng"
feedback_inc("cyborg_engineering",1)
@@ -205,10 +223,13 @@
updatename(mod)
module = new /obj/item/weapon/robot_module/janitor(src)
hands.icon_state = "janitor"
var/icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Mopbot", "Zamboni")
var/icontype
if (src.name == "Lucy" && src.ckey == "rowtree") icontype = ("Lucy")
else icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Mopbot", "Zamboni")
switch(icontype)
if("Basic") icon_state = "JanBot2"
if("Mopbot") icon_state = "janitorrobot"
if("Lucy") icon_state = "rowtree-lucy"
else icon_state = "mopgearrex"
modtype = "Jan"
feedback_inc("cyborg_janitor",1)