cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-06 07:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Alien removal surgery, new traitor item, other stuff.

Browse Source
This commit is contained in:
SkyMarshal
2011-12-28 23:15:30 -07:00
parent 43c2285a93
commit cc3bc60963
8 changed files with 137 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/WorkInProgress/SkyMarshal/eraser.dm Normal file
View File

@@ -0,0 +1,9 @@
/obj/item/weapon/stamperaser
name = "Eraser"
desc = "Some type of eraser, you guess."
flags = FPRINT | TABLEPASS
icon = 'items.dmi'
icon_state = "zippo"
item_state = "zippo"
w_class = 1.0
m_amt = 80

1
code/datums/diseases/alien_embryo.dm
View File

@@ -11,6 +11,7 @@
max_stages = 5
spread = "None"
spread_type = SPECIAL
stage_prob = 2
cure = "Unknown"
cure_id = list("lexorin","toxin","gargleblaster")
cure_chance = 20

1
code/defines/mob/living/carbon/carbon.dm
View File

@@ -5,6 +5,7 @@
var/brain_op_stage = 0.0
var/eye_op_stage = 0.0
var/appendix_op_stage = 0.0
var/embryo_op_stage = 0.0
var/datum/disease2/disease/virus2 = null
var/list/datum/disease2/disease/resistances2 = list()

10
code/defines/obj/weapon.dm
View File

@@ -824,6 +824,7 @@
icon = 'paper.dmi'
icon_state = "paper"
var/info = null
var/infoold = null
throwforce = 0
w_class = 1.0
throw_speed = 3
@@ -1458,6 +1459,11 @@
icon_state = "stamp-hos"
color = "hosred"
/obj/item/weapon/stamp/detective
name = "detective's rubber stamp"
icon_state = "stamp-hos"
color = "hosred"
/obj/item/weapon/stamp/ce
name = "chief engineer's rubber stamp"
icon_state = "stamp-ce"
@@ -1516,7 +1522,7 @@
name = "d4"
desc = "A dice with four sides."
sides = 4
icon_state = "d20"
icon_state = "dice"
item_state = "dice"
/obj/item/weapon/dice // -- TLE
@@ -1708,4 +1714,4 @@
desc = "A container for hold compressed matter awaiting re-construction."
origin_tech = "materials=5"
rating = 3
m_amt = 80
m_amt = 80

5
code/game/objects/devices/PDA/uplink.dm
View File

@@ -41,6 +41,7 @@
menu_message += "<A href='byond://?src=\ref[src];buy_item=card'>Syndicate Card</A> (3)<BR>"
menu_message += "<A href='byond://?src=\ref[src];buy_item=voice'>Voice-Changer</A> (4)<BR>"
menu_message += "<A href='byond://?src=\ref[src];buy_item=thermal'>Thermal Glasses</A> (4)<BR>"
menu_message += "<A href='byond://?src=\ref[src];buy_item=eraser'>Stamp Remover</A> (1)<BR>" //Allows doccuments to be de-stamped
menu_message += "<BR>"
menu_message += "<A href='byond://?src=\ref[src];buy_item=imp_freedom'>Freedom Implant (with injector)</A> (3)<BR>"
menu_message += "<A href='byond://?src=\ref[src];buy_item=imp_uplink'>Uplink Implant (5 crystals inside)</A> (10)<BR>"
@@ -212,6 +213,10 @@
if(uses >= 10)
uses -= 10
new /obj/item/weapon/storage/box/syndicate(get_turf(hostpda))
if("bundle")
if(uses >= 1)
uses -= 1
new /obj/item/weapon/stamperaser(get_turf(hostpda))
generate_menu()
print_to_host(menu_message)

36
code/game/objects/items/weapons/papers_bins.dm
View File

@@ -124,6 +124,7 @@ CLIPBOARDS
if(istype(P, /obj/item/weapon/stamp))
if ((!in_range(src, usr) && src.loc != user && !( istype(src.loc, /obj/item/weapon/clipboard) ) && src.loc.loc != user && user.equipped() != P))
return
src.infoold = src.info
src.info += text("<BR><i>This paper has been stamped with the [].</i><BR>", P.name)
switch(P.type)
if(/obj/item/weapon/stamp/captain)
@@ -141,11 +142,7 @@ CLIPBOARDS
if(/obj/item/weapon/stamp/denied)
src.overlays += "paper_stamped_denied"
if(/obj/item/weapon/stamp/clown)
if (!clown)
usr << "\red You are totally unable to use the stamp. HONK!"
return
else
src.overlays += "paper_stamped_clown"
src.overlays += "paper_stamped_clown"
else
src.overlays += "paper_stamped"
if(!stamped)
@@ -153,6 +150,35 @@ CLIPBOARDS
stamped += P.type
user << "\blue You stamp the paper with your rubber stamp."
else if(istype(P, /obj/item/weapon/stamperaser))
if ((!in_range(src, usr) && src.loc != user && !( istype(src.loc, /obj/item/weapon/clipboard) ) && src.loc.loc != user && user.equipped() != P))
return
src.info = src.infoold
for(var/i, i <= stamped.len, i++)
switch(stamped[i])
if(/obj/item/weapon/stamp/captain)
src.overlays -= "paper_stamped_cap"
if(/obj/item/weapon/stamp/hop)
src.overlays -= "paper_stamped_hop"
if(/obj/item/weapon/stamp/hos)
src.overlays -= "paper_stamped_hos"
if(/obj/item/weapon/stamp/ce)
src.overlays -= "paper_stamped_ce"
if(/obj/item/weapon/stamp/rd)
src.overlays -= "paper_stamped_rd"
if(/obj/item/weapon/stamp/cmo)
src.overlays -= "paper_stamped_cmo"
if(/obj/item/weapon/stamp/denied)
src.overlays -= "paper_stamped_denied"
if(/obj/item/weapon/stamp/clown)
src.overlays -= "paper_stamped_clown"
else
src.overlays -= "paper_stamped"
stamped = new list()
user << "\blue You sucessfully remove those pesky stamps."
/*
else
if (istype(P, /obj/item/weapon/weldingtool))

80
code/game/objects/items/weapons/surgery_tools.dm
View File

@@ -19,6 +19,32 @@ CIRCULAR SAW
if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/table/, M.loc) && (M.lying || M.weakened || M.stunned || M.paralysis || M.sleeping || M.stat) && prob(50))))
return ..()
if(user.zone_sel.selecting == "chest")
if(istype(M, /mob/living/carbon/human))
switch(M:embryo_op_stage)
if(2.0)
if(M != user)
for(var/mob/O in (viewers(M) - user - M))
O.show_message("\red [user] retracts the flap in [M]'s cut open torso with [src].", 1)
M << "\red [user] begins to retracts the flap in your chest with [src]!"
user << "\red You clamp retracts the flap in [M]'s torso with [src]!"
M:embryo_op_stage = 3.0
return
if(4.0)
if(M != user)
for(var/mob/O in (viewers(M) - user - M))
O.show_message("\red [user] rips the larva out of [M]'s torso!", 1)
M << "\red [user] begins to rip the larva out of [M]'s torso!"
user << "\red You rip the larva out of [M]'s torso!"
var/mob/living/carbon/alien/larva/stupid = new(M.loc)
stupid.death(0)
//Make a larva and kill it. -- SkyMarshal
M:embryo_op_stage = 5.0
for(var/datum/disease/alien_embryo in M.viruses)
alien_embryo.cure()
return
return
if(user.zone_sel.selecting == "groin")
if(istype(M, /mob/living/carbon/human))
switch(M:appendix_op_stage)
@@ -92,6 +118,26 @@ CIRCULAR SAW
if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/table/, M.loc) && M.lying && prob(50))))
return ..()
if(user.zone_sel.selecting == "chest")
if(istype(M, /mob/living/carbon/human))
switch(M:embryo_op_stage)
if(1.0)
if(M != user)
for(var/mob/O in (viewers(M) - user - M))
O.show_message("\red [user] is beginning to clamp bleeders in [M]'s cut open torso with [src].", 1)
M << "\red [user] begins to torso bleeders in your chest with [src]!"
user << "\red You clamp bleeders in [M]'s torso with [src]!"
M:embryo_op_stage = 2.0
return
if(5.0)
if(M != user)
for(var/mob/O in (viewers(M) - user - M))
O.show_message("\red [user] cleans out the debris from [M]'s cut open torso with [src].", 1)
M << "\red [user] begins to clean out the debris in your torso with [src]!"
user << "\red You clean out the debris from in [M]'s torso with [src]!"
M:embryo_op_stage = 6.0
return
if(user.zone_sel.selecting == "groin")
if(istype(M, /mob/living/carbon/human))
switch(M:appendix_op_stage)
@@ -177,6 +223,18 @@ CIRCULAR SAW
if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/table/, M.loc) && M.lying && prob(50))))
return ..()
if(user.zone_sel.selecting == "chest")
if(istype(M, /mob/living/carbon/human))
switch(M:embryo_op_stage)
if(6.0)
if(M != user)
for(var/mob/O in (viewers(M) - user - M))
O.show_message("\red [user] is beginning to cauterize the incision in [M]'s torso with [src].", 1)
M << "\red [user] begins to cauterize the incision in your torso with [src]!"
user << "\red You cauterize the incision in [M]'s torso with [src]!"
M:embryo_op_stage = 7.0
return
if(user.zone_sel.selecting == "groin")
if(istype(M, /mob/living/carbon/human))
switch(M:appendix_op_stage)
@@ -264,6 +322,28 @@ CIRCULAR SAW
src.add_fingerprint(user)
if(user.zone_sel.selecting == "chest")
if(istype(M, /mob/living/carbon/human))
switch(M:embryo_op_stage)
if(0.0)
if(M != user)
for(var/mob/O in (viewers(M) - user - M))
O.show_message("\red [M] is beginning to have his torso cut open with [src] by [user].", 1)
M << "\red [user] begins to cut open your torso with [src]!"
user << "\red You cut [M]'s torso open with [src]!"
M:embryo_op_stage = 1.0
if(3.0)
if(M != user)
for(var/mob/O in (viewers(M) - user - M))
O.show_message("\red [M] is beginning to have his stomach cut open with [src] by [user].", 1)
M << "\red [user] begins to cut open your stomach with [src]!"
user << "\red You cut [M]'s stomach open with [src]!"
for(var/datum/disease/D in M.viruses)
if(istype(D, /datum/disease/alien_embryo))
user << "\red There's something wiggling in there!"
M:embryo_op_stage = 4.0
return
if(user.zone_sel.selecting == "groin")
if(istype(M, /mob/living/carbon/human))
switch(M:appendix_op_stage)

3
code/game/objects/items/weapons/uplinks.dm
View File

@@ -44,9 +44,10 @@ SYNDICATE UPLINK
dat += "<A href='byond://?src=\ref[src];buy_item=card'>Syndicate Card</A> (3)<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=voice'>Voice-Changer</A> (4)<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=thermal'>Thermal Glasses</A> (4)<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=eraser'>Stamp Remover</A> (1)<BR>"
dat += "<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=imp_freedom'>Freedom Implant (with injector)</A> (3)<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=paralysispen'>Paralysis Pen</A> (3)<BR>" //Note that this goes to the updated sleepypen now.
// dat += "<A href='byond://?src=\ref[src];buy_item=paralysispen'>Paralysis Pen</A> (3)<BR>" //Note that this goes to the updated sleepypen now.
dat += "<A href='byond://?src=\ref[src];buy_item=sleepypen'>Sleepy Pen</A> (4)<BR>" //Terrible -Pete. //Reinstated -Skymarshal
dat += "<BR>"
dat += "<A href='byond://?src=\ref[src];buy_item=detomatix'>Detomatix Cartridge</A> (3)<BR>"