cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 14:00:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

New Check (#11304)

Browse Source
This commit is contained in:
Geeves
2021-03-01 16:40:59 +01:00
committed by GitHub
parent 0d5ada01c8
commit 714448e714
42 changed files with 307 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/landmarks.dm
+145 -163
View File
@@ -6,53 +6,57 @@
unacidable = 1
simulated = 0
invisibility = 101
var/delete_me = 0
/obj/effect/landmark/New()
..()
var/add_to_landmark_list = TRUE
/obj/effect/landmark/Initialize()
. = ..()
var/do_qdel = do_landmark_action()
if(do_qdel)
return INITIALIZE_HINT_QDEL
if(add_to_landmark_list)
landmarks_list += src
/obj/effect/landmark/Destroy()
landmarks_list -= src
return ..()
/obj/effect/landmark/proc/do_landmark_action()
tag = text("landmark*[]", name)
switch(name) //some of these are probably obsolete
if("monkey")
monkeystart += loc
delete_me = 1
return
return TRUE
if("start")
newplayer_start = get_turf(loc)
delete_me = 1
return
return TRUE
if("JoinLate")
latejoin += loc
delete_me = 1
return
return TRUE
if("KickoffLocation")
kickoffsloc += loc
delete_me = 1
return
return TRUE
if("JoinLateGateway")
latejoin_gateway += loc
delete_me = 1
return
return TRUE
if("JoinLateCryo")
latejoin_cryo += loc
delete_me = 1
return
return TRUE
if("JoinLateCryoCommand")
latejoin_cryo_command += loc
delete_me = 1
return
return TRUE
if("JoinLateCyborg")
latejoin_cyborg += loc
delete_me = 1
return
return TRUE
if("JoinLateMerchant")
latejoin_merchant += loc
delete_me = 1
return
return TRUE
if("prisonwarp")
prisonwarp += loc
delete_me = 1
return
return TRUE
if("Holding Facility")
holdingfacility += loc
if("tdome1")
@@ -65,43 +69,24 @@
tdomeobserve += loc
if("prisonsecuritywarp")
prisonsecuritywarp += loc
delete_me = 1
return
return TRUE
if("xeno_spawn")
xeno_spawn += loc
delete_me = 1
return
return TRUE
if("endgame_exit")
endgame_safespawns += loc
delete_me = 1
return
return TRUE
if("bluespacerift")
endgame_exits += loc
delete_me = 1
return
return TRUE
if("asteroid spawn")
asteroid_spawn += loc
delete_me = 1
return
return TRUE
if("skrell_entry")
dream_entries += loc
delete_me = 1
return
return TRUE
landmarks_list += src
return 1
/obj/effect/landmark/proc/delete()
delete_me = 1
/obj/effect/landmark/Initialize()
. = ..()
if(delete_me)
qdel(src)
/obj/effect/landmark/Destroy()
landmarks_list -= src
return ..()
return FALSE
/obj/effect/landmark/start
name = "start"
@@ -110,146 +95,143 @@
anchored = 1.0
invisibility = 101
/obj/effect/landmark/start/New()
..()
/obj/effect/landmark/start/do_landmark_action()
tag = "start*[name]"
return 1
return FALSE
//Costume spawner landmarks
/obj/effect/landmark/costume/New() //costume spawner, selects a random subclass and disappears
/obj/effect/landmark/costume/do_landmark_action() //costume spawner, selects a random subclass and disappears
var/list/options = typesof(/obj/effect/landmark/costume)
var/PICK= options[rand(1,options.len)]
new PICK(src.loc)
delete_me = 1
var/costume_type = pick(options)
new costume_type(loc)
return TRUE
//SUBCLASSES. Spawn a bunch of items and disappear likewise
/obj/effect/landmark/costume/chicken/New()
new /obj/item/clothing/suit/chickensuit(src.loc)
new /obj/item/clothing/head/chicken(src.loc)
new /obj/item/reagent_containers/food/snacks/egg(src.loc)
delete_me = 1
/obj/effect/landmark/costume/chicken/do_landmark_action()
new /obj/item/clothing/suit/chickensuit(loc)
new /obj/item/clothing/head/chicken(loc)
new /obj/item/reagent_containers/food/snacks/egg(loc)
return TRUE
/obj/effect/landmark/costume/gladiator/New()
new /obj/item/clothing/under/gladiator(src.loc)
new /obj/item/clothing/head/helmet/gladiator(src.loc)
delete_me = 1
/obj/effect/landmark/costume/gladiator/do_landmark_action()
new /obj/item/clothing/under/gladiator(loc)
new /obj/item/clothing/head/helmet/gladiator(loc)
return TRUE
/obj/effect/landmark/costume/madscientist/New()
new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
new /obj/item/clothing/head/flatcap(src.loc)
new /obj/item/clothing/suit/storage/toggle/labcoat(src.loc)
new /obj/item/clothing/glasses/regular(src.loc)
delete_me = 1
/obj/effect/landmark/costume/madscientist/do_landmark_action()
new /obj/item/clothing/under/gimmick/rank/captain/suit(loc)
new /obj/item/clothing/head/flatcap(loc)
new /obj/item/clothing/suit/storage/toggle/labcoat(loc)
new /obj/item/clothing/glasses/regular(loc)
return TRUE
/obj/effect/landmark/costume/elpresidente/New()
new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
new /obj/item/clothing/head/flatcap(src.loc)
new /obj/item/clothing/mask/smokable/cigarette/cigar/havana(src.loc)
new /obj/item/clothing/shoes/jackboots(src.loc)
delete_me = 1
/obj/effect/landmark/costume/elpresidente/do_landmark_action()
new /obj/item/clothing/under/gimmick/rank/captain/suit(loc)
new /obj/item/clothing/head/flatcap(loc)
new /obj/item/clothing/mask/smokable/cigarette/cigar/havana(loc)
new /obj/item/clothing/shoes/jackboots(loc)
return TRUE
/obj/effect/landmark/costume/maid/New()
new /obj/item/clothing/under/skirt/(src.loc)
var/CHOICE = pick( /obj/item/clothing/head/beret , /obj/item/clothing/head/rabbitears )
new CHOICE(src.loc)
new /obj/item/clothing/glasses/sunglasses/blindfold(src.loc)
delete_me = 1
/obj/effect/landmark/costume/maid/do_landmark_action()
new /obj/item/clothing/under/skirt(loc)
var/maid_headwear_type = pick(/obj/item/clothing/head/beret, /obj/item/clothing/head/rabbitears)
new maid_headwear_type(loc)
new /obj/item/clothing/glasses/sunglasses/blindfold(loc) // hollup
return TRUE
/obj/effect/landmark/costume/butler/New()
new /obj/item/clothing/suit/wcoat(src.loc)
new /obj/item/clothing/under/suit_jacket(src.loc)
new /obj/item/clothing/head/that(src.loc)
delete_me = 1
/obj/effect/landmark/costume/butler/do_landmark_action()
new /obj/item/clothing/suit/wcoat(loc)
new /obj/item/clothing/under/suit_jacket(loc)
new /obj/item/clothing/head/that(loc)
return TRUE
/obj/effect/landmark/costume/scratch/New()
new /obj/item/clothing/gloves/white(src.loc)
new /obj/item/clothing/shoes/white(src.loc)
new /obj/item/clothing/under/suit_jacket/white(src.loc)
if (prob(30))
new /obj/item/clothing/head/cueball(src.loc)
delete_me = 1
/obj/effect/landmark/costume/scratch/do_landmark_action()
new /obj/item/clothing/gloves/white(loc)
new /obj/item/clothing/shoes/white(loc)
new /obj/item/clothing/under/suit_jacket/white(loc)
if(prob(30))
new /obj/item/clothing/head/cueball(loc)
return TRUE
/obj/effect/landmark/costume/highlander/New()
new /obj/item/clothing/under/kilt(src.loc)
new /obj/item/clothing/head/beret/red(src.loc)
delete_me = 1
/obj/effect/landmark/costume/highlander/do_landmark_action()
new /obj/item/clothing/under/kilt(loc)
new /obj/item/clothing/head/beret/red(loc)
return TRUE
/obj/effect/landmark/costume/prig/New()
new /obj/item/clothing/suit/wcoat(src.loc)
new /obj/item/clothing/glasses/monocle(src.loc)
var/CHOICE= pick( /obj/item/clothing/head/bowler, /obj/item/clothing/head/that)
new CHOICE(src.loc)
new /obj/item/clothing/shoes/black(src.loc)
new /obj/item/cane(src.loc)
new /obj/item/clothing/under/sl_suit(src.loc)
new /obj/item/clothing/mask/fakemoustache(src.loc)
delete_me = 1
/obj/effect/landmark/costume/prig/do_landmark_action()
new /obj/item/clothing/suit/wcoat(loc)
new /obj/item/clothing/glasses/monocle(loc)
var/hat_path = pick(/obj/item/clothing/head/bowler, /obj/item/clothing/head/that)
new hat_path(loc)
new /obj/item/clothing/shoes/black(loc)
new /obj/item/cane(loc)
new /obj/item/clothing/under/sl_suit(loc)
new /obj/item/clothing/mask/fakemoustache(loc)
return TRUE
/obj/effect/landmark/costume/plaguedoctor/New()
new /obj/item/clothing/suit/bio_suit/plaguedoctorsuit(src.loc)
new /obj/item/clothing/head/plaguedoctorhat(src.loc)
delete_me = 1
/obj/effect/landmark/costume/plaguedoctor/do_landmark_action()
new /obj/item/clothing/suit/bio_suit/plaguedoctorsuit(loc)
new /obj/item/clothing/head/plaguedoctorhat(loc)
return TRUE
/obj/effect/landmark/costume/nightowl/New()
new /obj/item/clothing/under/owl(src.loc)
new /obj/item/clothing/mask/gas/owl_mask(src.loc)
delete_me = 1
/obj/effect/landmark/costume/nightowl/do_landmark_action()
new /obj/item/clothing/under/owl(loc)
new /obj/item/clothing/mask/gas/owl_mask(loc)
return TRUE
/obj/effect/landmark/costume/waiter/New()
new /obj/item/clothing/under/waiter(src.loc)
new /obj/item/clothing/head/rabbitears(src.loc)
new /obj/item/clothing/suit/apron(src.loc)
delete_me = 1
/obj/effect/landmark/costume/waiter/do_landmark_action()
new /obj/item/clothing/under/waiter(loc)
new /obj/item/clothing/head/rabbitears(loc)
new /obj/item/clothing/suit/apron(loc)
return TRUE
/obj/effect/landmark/costume/pirate/New()
new /obj/item/clothing/suit/pirate(src.loc)
var/CHOICE = pick( /obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana/pirate)
new CHOICE(src.loc)
new /obj/item/clothing/glasses/eyepatch(src.loc)
delete_me = 1
/obj/effect/landmark/costume/pirate/do_landmark_action()
new /obj/item/clothing/suit/pirate(loc)
var/hat_path = pick(/obj/item/clothing/head/pirate, /obj/item/clothing/head/bandana/pirate)
new hat_path(loc)
new /obj/item/clothing/glasses/eyepatch(loc)
return TRUE
/obj/effect/landmark/costume/commie/New()
new /obj/item/clothing/head/ushanka/grey(src.loc)
delete_me = 1
/obj/effect/landmark/costume/commie/do_landmark_action()
new /obj/item/clothing/head/ushanka/grey(loc)
return TRUE
/obj/effect/landmark/costume/imperium_monk/New()
new /obj/item/clothing/suit/imperium_monk(src.loc)
if (prob(25))
new /obj/item/clothing/mask/gas/cyborg(src.loc)
delete_me = 1
/obj/effect/landmark/costume/imperium_monk/do_landmark_action()
new /obj/item/clothing/suit/imperium_monk(loc)
if(prob(25))
new /obj/item/clothing/mask/gas/cyborg(loc)
return TRUE
/obj/effect/landmark/costume/holiday_priest/New()
new /obj/item/clothing/suit/holidaypriest(src.loc)
delete_me = 1
/obj/effect/landmark/costume/holiday_priest/do_landmark_action()
new /obj/item/clothing/suit/holidaypriest(loc)
return TRUE
/obj/effect/landmark/costume/marisawizard/fake/New()
new /obj/item/clothing/head/wizard/marisa/fake(src.loc)
new/obj/item/clothing/suit/wizrobe/marisa/fake(src.loc)
delete_me = 1
/obj/effect/landmark/costume/marisawizard/fake/do_landmark_action()
new /obj/item/clothing/head/wizard/marisa/fake(loc)
new/obj/item/clothing/suit/wizrobe/marisa/fake(loc)
return TRUE
/obj/effect/landmark/costume/cutewitch/New()
new /obj/item/clothing/under/sundress(src.loc)
new /obj/item/clothing/head/witchwig(src.loc)
new /obj/item/staff/broom(src.loc)
delete_me = 1
/obj/effect/landmark/costume/cutewitch/do_landmark_action()
new /obj/item/clothing/under/sundress(loc)
new /obj/item/clothing/head/witchwig(loc)
new /obj/item/staff/broom(loc)
return TRUE
/obj/effect/landmark/costume/fakewizard/New()
new /obj/item/clothing/suit/wizrobe/fake(src.loc)
new /obj/item/clothing/head/wizard/fake(src.loc)
new /obj/item/staff/(src.loc)
delete_me = 1
/obj/effect/landmark/costume/fakewizard/do_landmark_action()
new /obj/item/clothing/suit/wizrobe/fake(loc)
new /obj/item/clothing/head/wizard/fake(loc)
new /obj/item/staff(loc)
return TRUE
/obj/effect/landmark/costume/sexyclown/New()
new /obj/item/clothing/mask/gas/sexyclown(src.loc)
new /obj/item/clothing/under/sexyclown(src.loc)
delete_me = 1
/obj/effect/landmark/costume/sexyclown/do_landmark_action()
new /obj/item/clothing/mask/gas/sexyclown(loc)
new /obj/item/clothing/under/sexyclown(loc)
return TRUE
/obj/effect/landmark/costume/sexymime/New()
new /obj/item/clothing/mask/gas/sexymime(src.loc)
new /obj/item/clothing/under/sexymime(src.loc)
delete_me = 1
/obj/effect/landmark/costume/sexymime/do_landmark_action()
new /obj/item/clothing/mask/gas/sexymime(loc)
new /obj/item/clothing/under/sexymime(loc)
return TRUE
/obj/effect/landmark/dungeon_spawn
name = "asteroid spawn"
code/game/objects/effects/manifest.dm
-21
View File
@@ -1,21 +0,0 @@
/obj/effect/manifest
name = "manifest"
icon = 'icons/mob/screen/generic.dmi'
icon_state = "x"
unacidable = 1//Just to be sure.
/obj/effect/manifest/New()
src.invisibility = 101
return
/obj/effect/manifest/proc/manifest()
var/dat = "<B>Crew Manifest</B>:<BR>"
for(var/mob/living/carbon/human/M in mob_list)
dat += text(" <B>[]</B> - []<BR>", M.name, M.get_assignment())
var/obj/item/paper/P = new /obj/item/paper( src.loc )
P.info = dat
P.name = "paper- 'Crew Manifest'"
//SN src = null
qdel(src)
return
code/game/objects/items/bees_items.dm
+5 -3
View File
@@ -19,9 +19,11 @@
name = "bottle of BeezEez"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle17"
New()
src.pixel_x = rand(-5.0, 5)
src.pixel_y = rand(-5.0, 5)
randpixel = 5
/obj/item/beezeez/Initialize()
. = ..()
randpixel_xy()
/obj/item/reagent_containers/food/snacks/honeycomb
name = "honeycomb"
code/game/objects/items/devices/spy_bug.dm
+4 -3
View File
@@ -19,8 +19,8 @@
var/obj/item/device/radio/spy/radio
var/obj/machinery/camera/spy/camera
/obj/item/device/spy_bug/New()
..()
/obj/item/device/spy_bug/Initialize()
. = ..()
radio = new(src)
camera = new(src)
listening_objects += src
@@ -67,7 +67,8 @@
var/obj/machinery/camera/spy/selected_camera
var/list/obj/machinery/camera/spy/cameras = new()
/obj/item/device/spy_monitor/New()
/obj/item/device/spy_monitor/Initialize()
. = ..()
radio = new(src)
listening_objects += src
code/game/objects/items/devices/uplink.dm
+30 -24
View File
@@ -22,17 +22,20 @@ A list of items and costs is stored under the datum of every game mode, alongsid
/obj/item/device/uplink/ui_host()
return loc
/obj/item/device/uplink/New(var/location, var/datum/mind/owner, var/telecrystals = DEFAULT_TELECRYSTAL_AMOUNT)
..()
src.uplink_owner = owner
purchase_log = list()
world_uplinks += src
uses = telecrystals
/obj/item/device/uplink/Initialize(mapload, var/datum/mind/owner, var/telecrystals = DEFAULT_TELECRYSTAL_AMOUNT)
. = ..()
do_uplink_action(owner, telecrystals)
/obj/item/device/uplink/Destroy()
world_uplinks -= src
return ..()
/obj/item/device/uplink/proc/do_uplink_action(var/datum/mind/owner, var/telecrystals = DEFAULT_TELECRYSTAL_AMOUNT)
src.uplink_owner = owner
purchase_log = list()
world_uplinks += src
uses = telecrystals
// HIDDEN UPLINK - Can be stored in anything but the host item has to have a trigger for it.
/* How to create an uplink in 3 easy steps!
@@ -53,15 +56,16 @@ A list of items and costs is stored under the datum of every game mode, alongsid
var/exploit_id // Id of the current exploit record we are viewing
var/pda_code = ""
// The hidden uplink MUST be inside an obj/item's contents.
/obj/item/device/uplink/hidden/New()
spawn(2)
if(!istype(src.loc, /obj/item))
qdel(src)
/obj/item/device/uplink/hidden/do_uplink_action(var/datum/mind/owner, var/telecrystals = DEFAULT_TELECRYSTAL_AMOUNT)
..()
nanoui_data = list()
update_nano_data()
addtimer(CALLBACK(src, .proc/check_loc), 2)
/obj/item/device/uplink/hidden/proc/check_loc()
if(!isitem(loc))
qdel(src)
// Toggles the uplink on and off. Normally this will bypass the item's normal functions and go to the uplink menu, if activated.
/obj/item/device/uplink/hidden/proc/toggle()
@@ -314,26 +318,28 @@ A list of items and costs is stored under the datum of every game mode, alongsid
// Includes normal radio uplink, multitool uplink,
// implant uplink (not the implant tool) and a preset headset uplink.
/obj/item/device/radio/uplink/New(var/loc, var/mind)
/obj/item/device/radio/uplink/Initialize(mapload, var/datum/mind/mind)
. = ..()
hidden_uplink = new(src, mind)
icon_state = "radio"
/obj/item/device/radio/uplink/attack_self(mob/user as mob)
/obj/item/device/radio/uplink/attack_self(mob/user)
if(hidden_uplink)
hidden_uplink.trigger(user)
/obj/item/device/multitool/uplink/New(var/loc, var/mind)
/obj/item/device/multitool/uplink/Initialize(mapload, var/datum/mind/mind)
. = ..()
hidden_uplink = new(src, mind)
/obj/item/device/multitool/uplink/attack_self(mob/user as mob)
/obj/item/device/multitool/uplink/attack_self(mob/user)
if(hidden_uplink)
hidden_uplink.trigger(user)
/obj/item/device/radio/headset/uplink
traitor_frequency = 1445
/obj/item/device/radio/headset/uplink/New(var/loc, var/mind)
..()
/obj/item/device/radio/headset/uplink/Initialize(mapload, var/datum/mind/mind)
. = ..()
hidden_uplink = new(src, mind)
hidden_uplink.uses = DEFAULT_TELECRYSTAL_AMOUNT
@@ -349,13 +355,13 @@ A list of items and costs is stored under the datum of every game mode, alongsid
flags = CONDUCT
w_class = ITEMSIZE_SMALL
/obj/item/device/contract_uplink/New(var/loc, var/mind)
..()
/obj/item/device/contract_uplink/Initialize(mapload, var/datum/mind/mind)
. = ..()
hidden_uplink = new(src, mind)
hidden_uplink.uses = 0
hidden_uplink.nanoui_menu = 3
/obj/item/device/contract_uplink/attack_self(mob/user as mob)
/obj/item/device/contract_uplink/attack_self(mob/user)
if (hidden_uplink)
hidden_uplink.trigger(user)
@@ -368,7 +374,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
desc_antag = "This device allows you to create a single central command report. It has only one use."
w_class = ITEMSIZE_SMALL
/obj/item/device/announcer/attack_self(mob/user as mob)
/obj/item/device/announcer/attack_self(mob/user)
if(!player_is_antag(user.mind))
return
@@ -394,8 +400,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid
w_class = ITEMSIZE_SMALL
var/starting_telecrystals // how much telecrystals the uplink should spawn with, defaults to default amount if not set
/obj/item/device/special_uplink/New(var/loc, var/mind)
..()
/obj/item/device/special_uplink/Initialize(mapload, var/datum/mind/mind)
. = ..()
hidden_uplink = new(src, mind)
if(!starting_telecrystals)
hidden_uplink.uses = DEFAULT_TELECRYSTAL_AMOUNT
@@ -403,7 +409,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
hidden_uplink.uses = starting_telecrystals
hidden_uplink.nanoui_menu = 1
/obj/item/device/special_uplink/attack_self(mob/user as mob)
/obj/item/device/special_uplink/attack_self(mob/user)
if(hidden_uplink)
hidden_uplink.trigger(user)
code/game/objects/items/toys.dm
+3 -3
View File
@@ -43,10 +43,10 @@
drop_sound = 'sound/items/drop/rubber.ogg'
pickup_sound = 'sound/items/pickup/rubber.ogg'
/obj/item/toy/waterballoon/New()
var/datum/reagents/R = new/datum/reagents(10)
/obj/item/toy/waterballoon/Initialize()
. = ..()
var/datum/reagents/R = new /datum/reagents(10, src)
reagents = R
R.my_atom = src
/obj/item/toy/waterballoon/attack(mob/living/carbon/human/M as mob, mob/user as mob)
return
code/game/objects/items/weapons/cosmetics.dm
+12 -12
View File
@@ -6,40 +6,40 @@
icon_state = "lipstick"
w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
var/colour = "red"
var/lipstick_color = "red"
var/open = 0
drop_sound = 'sound/items/drop/screwdriver.ogg'
pickup_sound = 'sound/items/pickup/screwdriver.ogg'
/obj/item/lipstick/purple
name = "purple lipstick"
colour = "purple"
lipstick_color = "purple"
/obj/item/lipstick/jade
name = "jade lipstick"
colour = "jade"
lipstick_color = "jade"
/obj/item/lipstick/black
name = "black lipstick"
colour = "black"
lipstick_color = "black"
/obj/item/lipstick/pink
name = "pink lipstick"
colour = "pink"
lipstick_color = "pink"
/obj/item/lipstick/random
name = "lipstick"
/obj/item/lipstick/random/New()
colour = pick("red","purple","jade","pink","black")
name = "[colour] lipstick"
/obj/item/lipstick/random/Initialize()
. = ..()
name = "[lipstick_color] lipstick"
lipstick_color = pick("red","purple","jade","pink","black")
/obj/item/lipstick/attack_self(mob/user as mob)
to_chat(user, "<span class='notice'>You twist \the [src] [open ? "closed" : "open"].</span>")
open = !open
if(open)
icon_state = "[initial(icon_state)]_[colour]"
icon_state = "[initial(icon_state)]_[lipstick_color]"
else
icon_state = initial(icon_state)
@@ -56,7 +56,7 @@
if(H == user)
user.visible_message("<span class='notice'>[user] does their lips with \the [src].</span>", \
"<span class='notice'>You take a moment to apply \the [src]. Perfect!</span>")
H.lip_style = colour
H.lip_style = lipstick_color
H.update_body()
else
user.visible_message("<span class='warning'>[user] begins to do [H]'s lips with \the [src].</span>", \
@@ -64,7 +64,7 @@
if(do_after(user, 20) && do_after(H, 20, 0)) //user needs to keep their active hand, H does not.
user.visible_message("<span class='notice'>[user] does [H]'s lips with \the [src].</span>", \
"<span class='notice'>You apply \the [src].</span>")
H.lip_style = colour
H.lip_style = lipstick_color
H.update_body()
else
to_chat(user, "<span class='notice'>Where are the lips on that?</span>")
code/game/objects/items/weapons/dna_injector.dm
+2 -1
View File
@@ -24,7 +24,8 @@
var/datatype=0
var/value=0
/obj/item/dnainjector/New()
/obj/item/dnainjector/Initialize()
. = ..()
if(datatype && block)
buf=new
buf.dna=new
code/game/objects/items/weapons/melee/energy.dm
+12 -9
View File
@@ -236,23 +236,26 @@
origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4)
sharp = 1
edge = 1
var/possible_blade_colors = "{'red':1,'blue':1,'green':1,'purple':1}"
var/blade_color
shield_power = 75
/obj/item/melee/energy/sword/New()
blade_color = pick("red","blue","green","purple")
/obj/item/melee/energy/sword/Initialize()
. = ..()
blade_color = pick(json_decode(possible_blade_colors))
/obj/item/melee/energy/sword/green/New()
/obj/item/melee/energy/sword/green
possible_blade_colors = "{'green':1}"
blade_color = "green"
/obj/item/melee/energy/sword/red/New()
blade_color = "red"
/obj/item/melee/energy/sword/red
possible_blade_colors = "{'red':1}"
/obj/item/melee/energy/sword/blue/New()
blade_color = "blue"
/obj/item/melee/energy/sword/blue
possible_blade_colors = "{'blue':1}"
/obj/item/melee/energy/sword/purple/New()
blade_color = "purple"
/obj/item/melee/energy/sword/purple
possible_blade_colors = "{'blue':1}"
/obj/item/melee/energy/sword/activate(mob/living/user)
if(!active)
code/game/objects/items/weapons/syndie.dm
+2 -1
View File
@@ -23,7 +23,8 @@
power = 2
size = "large"
/obj/item/syndie/c4explosive/New()
/obj/item/syndie/c4explosive/Initialize()
. = ..()
var/K = rand(1,2000)
K = md5(num2text(K)+name)
K = copytext(K,1,7)
code/game/objects/structures/musician.dm
+2 -1
View File
@@ -20,7 +20,8 @@
var/force_piano = FALSE
var/broken = 0 //Whether or not the piano can actually be played.
/obj/structure/device/piano/New()
/obj/structure/device/piano/Initialize(mapload)
. = ..()
if(prob(50) && !force_piano)
name = "space minimoog"
desc = "This is a minimoog, like a space piano, but more spacey!"