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

Merge pull request #613 from SkyMarshal/master

Browse Source 
Map update, CE now knows wire colors, added some old BS12 stuff (AI upload sprite, warning stripes), complete mute can still be adminhelped, removed gooncode in hallucinations, fixed the poweroffline event, fixed Tajspeak, fixed the blob, fixed overdoses
This commit is contained in:
Albert Iordache
2012-03-03 23:55:37 -08:00
parent 1575df93ce 71a9961b0c
commit 3fcf067310
24 changed files with 6485 additions and 6303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+1 -1
View File
@@ -476,7 +476,7 @@
M.client.muted_complete = !M.client.muted_complete
log_admin("[key_name(usr)] has [(M.client.muted_complete ? "completely muted" : "voiced (complete)")] [key_name(M)].")
message_admins("\blue [key_name_admin(usr)] has [(M.client.muted_complete ? "completely muted" : "voiced (complete)")] [key_name_admin(M)].", 1)
M << "You have been [(M.client.muted_complete ? "completely muted" : "voiced (complete)")]. You are unable to speak or even adminhelp"
M << "You have been [(M.client.muted_complete ? "completely muted" : "voiced (complete)")]. You are unable to speak."
if (href_list["c_mode"])
if ((src.rank in list( "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" )))
code/modules/admin/verbs/adminhelp.dm
+2 -2
View File
@@ -7,8 +7,8 @@
if (!msg)
return
if (usr.client && usr.client.muted_complete)
return
// if (usr.client && usr.client.muted_complete)
// return
for (var/mob/M in world)
if (M.client && M.client.holder && (M.client.holder.level != -3))
code/modules/chemical/Chemistry-Reagents.dm
+26 -26
View File
@@ -437,7 +437,7 @@ datum
M.slurring = 0
M.confused = 0
M.jitteriness = 0
if(50 to INFINITY)
if(100 to INFINITY)
M:adjustToxLoss(0.1)
..()
return
@@ -473,8 +473,8 @@ datum
if(prob(10)) step(M, pick(cardinal))
if(prob(7)) M:emote(pick("twitch","drool","moan","giggle"))
holder.remove_reagent(src.id, 0.2)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
if(data >= 100)
M:adjustToxLoss(0.1)
return
serotrotium
@@ -865,8 +865,8 @@ datum
M.mutations = 0
M.disabilities = 0
switch(data)
if(50 to INFINITY)
M:adjustToxLoss(min(((data-50)/10),3))
if(100 to INFINITY)
M:adjustToxLoss(0.2)
..()
return
@@ -1173,8 +1173,8 @@ datum
M.bodytemperature = max(310, M.bodytemperature-20)
else if(M.bodytemperature < 311)
M.bodytemperature = min(310, M.bodytemperature+20)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
if(data >= 100)
M:adjustToxLoss(0.2)
..()
return
@@ -1194,7 +1194,7 @@ datum
M.confused = max(M.confused, 20)
holder.remove_reagent(src.id, 0.2)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
M:adjustToxLoss(0.2)
..()
return
@@ -1230,8 +1230,8 @@ datum
if(!data) data = 1
data++
M:heal_organ_damage(0,2)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
if(data >= 100)
M:adjustToxLoss(0.1)
..()
return
@@ -1249,8 +1249,8 @@ datum
if(!data) data = 1
data++
M:heal_organ_damage(0,3)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
if(data >= 100)
M:adjustToxLoss(0.2)
..()
return
@@ -1270,8 +1270,8 @@ datum
M:adjustOxyLoss(-2)
if(holder.has_reagent("lexorin"))
holder.remove_reagent("lexorin", 2)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
if(data >= 100)
M:adjustToxLoss(0.2)
..()
return
@@ -1292,7 +1292,7 @@ datum
if(holder.has_reagent("lexorin"))
holder.remove_reagent("lexorin", 2)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
M:adjustToxLoss(0.2)
..()
return
@@ -1422,7 +1422,7 @@ datum
if(prob(50)) M:drowsyness = max(M:drowsyness, 3)
if(prob(10)) M:emote("drool")
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
M:adjustToxLoss(0.4)
..()
return
@@ -1437,7 +1437,7 @@ datum
if(!M) M = holder.my_atom
M:radiation = max(M:radiation-3,0)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
M:adjustToxLoss(0.2)
..()
return
@@ -1460,7 +1460,7 @@ datum
M.take_organ_damage(1, 0)
..()
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
M:adjustToxLoss(0.3)
return
alkysine
@@ -1491,8 +1491,8 @@ datum
M:eye_blurry = max(M:eye_blurry-5 , 0)
M:eye_blind = max(M:eye_blind-5 , 0)
M:disabilities &= ~1
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
if(data >= 100)
M:adjustToxLoss(0.2)
..()
return
@@ -1510,8 +1510,8 @@ datum
if(!data) data = 1
data++
M:heal_organ_damage(2,0)
if(data >= 50)
M:adjustToxLoss(0.1)
if(data >= 100)
M:adjustToxLoss(0.2)
..()
return
@@ -1529,7 +1529,7 @@ datum
if(prob(5)) M:emote(pick("twitch","blink_r","shiver"))
holder.remove_reagent(src.id, 0.2)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/5),3))
M:adjustToxLoss(0.2)
..()
return
@@ -1580,8 +1580,8 @@ datum
if(!data) data = 1
data++
holder.remove_reagent(src.id, 0.1)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
if(data >= 100)
M:adjustToxLoss(0.1)
return
carpotoxin
@@ -1646,7 +1646,7 @@ datum
if(!data) data = 1
data++
M:hallucination += 5
if(data >= 50)
if(data >= 100)
M:adjustToxLoss(0.1)
..()
return
code/modules/flufftext/Hallucination.dm
+4 -5
View File
@@ -243,7 +243,7 @@ proc/check_panel(mob/M)
M << "\red <B>[my_target] flails around wildly.</B>"
my_target.show_message("\red <B>[src] has been attacked by [my_target] </B>", 1) //Lazy.
//src.health -= P.power
src.health -= P.force
return
@@ -256,12 +256,13 @@ proc/check_panel(mob/M)
O << "\red <B>[my_target] stumbles around.</B>"
New()
..()
spawn(300)
if(my_target)
my_target.hallucinations -= src
del(src)
step_away(src,my_target,2)
proccess()
processing_objects.Add(src)
proc/updateimage()
@@ -283,8 +284,7 @@ proc/check_panel(mob/M)
my_target << currentimage
proc/proccess()
if(!my_target) spawn(5) .()
process()
if(src.health < 0)
collapse()
return
@@ -312,7 +312,6 @@ proc/check_panel(mob/M)
if(prob(15))
step_away(src,my_target,2)
spawn(5) .()
proc/collapse()
collapse = 1
code/modules/mob/living/carbon/human/human_defense.dm
+8 -2
View File
@@ -108,11 +108,17 @@ emp_act
location.add_blood(src)
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.gloves) H.gloves.add_blood(src)
else H.add_blood(src)
if(H.wear_suit) H.wear_suit.add_blood(src)
else if(H.w_uniform) H.w_uniform.add_blood(src)
if(H.shoes) H.shoes.add_blood(src)
if (H.gloves)
H.gloves.add_blood(H)
H.gloves.transfer_blood = 2
H.gloves.bloody_hands_mob = H
else
H.add_blood(H)
H.bloody_hands = 2
H.bloody_hands_mob = H
switch(hit_area)
if("head")//Harder to score a stun but if you do it lasts a bit longer
code/modules/mob/living/say.dm
+13 -1
View File
@@ -153,7 +153,7 @@
if( !message_mode && (disease_symptoms & DISEASE_WHISPER))
message_mode = "whisper"
if(src.stunned > 0 && (!(traumatic_shock > 61) && prob(50)))
if(src.stunned > 0 || (!(traumatic_shock > 61) && prob(50)))
message_mode = "" //Stunned people shouldn't be able to physically turn on their radio/hold down the button to speak into it
@@ -319,6 +319,7 @@
listening = hearers(message_range, T)
var/list/V = view(message_range, T)
var/list/W = V
//find mobs in lockers, cryo, intellicards, brains, MMIs, and so on.
for (var/mob/M in world)
if (!M.client)
@@ -334,6 +335,10 @@
if (M.client && M.client.ghost_ears)
listening|=M
var/list/eavesdroppers = get_mobs_in_view(7, src)
for(var/mob/M in listening)
eavesdroppers.Remove(M)
for (var/obj/O in ((W | contents)-used_radios))
W |= O
@@ -504,6 +509,13 @@
del(B)
*/
if (length(eavesdroppers))
for (var/mob/M in eavesdroppers)
M << "\blue [src] speaks into their radio..."
M << speech_bubble
spawn(30) del(speech_bubble)
/obj/effect/speech_bubble
code/modules/projectiles/gun.dm
+3
View File
@@ -325,6 +325,9 @@ mob/proc
del(T.item_use_icon)
del(T.gun_move_icon)
del(T.gun_run_icon)
T.target_can_move = 0
T.target_can_run = 0
T.target_can_click = 0
if(!targeted_by.len) del targeted_by
spawn(1) update_clothing()