shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-30084

Browse Source
This commit is contained in:
kevinz000
2017-08-29 10:09:13 -07:00
parent 342fd1d7fa 3a015fc2f0
commit f344c5edf2
1211 changed files with 66401 additions and 82359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/holiday/halloween.dm
+14 -14
View File
@@ -9,8 +9,8 @@
/datum/round_event/spooky/start()
..()
for(var/mob/living/carbon/human/H in GLOB.mob_list)
var/obj/item/weapon/storage/backpack/b = locate() in H.contents
new /obj/item/weapon/storage/spooky(b)
var/obj/item/storage/backpack/b = locate() in H.contents
new /obj/item/storage/spooky(b)
if(ishuman(H) || islizard(H))
if(prob(50))
H.set_species(/datum/species/skeleton)
@@ -18,7 +18,7 @@
H.set_species(/datum/species/zombie)
for(var/mob/living/simple_animal/pet/dog/corgi/Ian/Ian in GLOB.mob_list)
Ian.place_on_head(new /obj/item/weapon/bedsheet(Ian))
Ian.place_on_head(new /obj/item/bedsheet(Ian))
for(var/mob/living/simple_animal/parrot/Poly/Poly in GLOB.mob_list)
new /mob/living/simple_animal/parrot/Poly/ghost(Poly.loc)
qdel(Poly)
@@ -99,13 +99,13 @@
priority_announce("Honk... Honk... honk... HONK! HONK! HONKHONKHONKHONKHONK", "HONK!", 'sound/spookoween/scary_horn.ogg')
//spooky foods (you can't actually make these when it's not halloween)
/obj/item/weapon/reagent_containers/food/snacks/sugarcookie/spookyskull
/obj/item/reagent_containers/food/snacks/sugarcookie/spookyskull
name = "skull cookie"
desc = "Spooky! It's got delicious calcium flavouring!"
icon = 'icons/obj/halloween_items.dmi'
icon_state = "skeletoncookie"
/obj/item/weapon/reagent_containers/food/snacks/sugarcookie/spookycoffin
/obj/item/reagent_containers/food/snacks/sugarcookie/spookycoffin
name = "coffin cookie"
desc = "Spooky! It's got delicious coffee flavouring!"
icon = 'icons/obj/halloween_items.dmi'
@@ -114,25 +114,25 @@
//spooky items
/obj/item/weapon/storage/spooky
/obj/item/storage/spooky
name = "trick-o-treat bag"
desc = "A pumpkin-shaped bag that holds all sorts of goodies!"
icon = 'icons/obj/halloween_items.dmi'
icon_state = "treatbag"
/obj/item/weapon/storage/spooky/New()
/obj/item/storage/spooky/New()
..()
for(var/distrobuteinbag=0 to 5)
var/type = pick(/obj/item/weapon/reagent_containers/food/snacks/sugarcookie/spookyskull,
/obj/item/weapon/reagent_containers/food/snacks/sugarcookie/spookycoffin,
/obj/item/weapon/reagent_containers/food/snacks/candy_corn,
/obj/item/weapon/reagent_containers/food/snacks/candy,
/obj/item/weapon/reagent_containers/food/snacks/candiedapple,
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
var/type = pick(/obj/item/reagent_containers/food/snacks/sugarcookie/spookyskull,
/obj/item/reagent_containers/food/snacks/sugarcookie/spookycoffin,
/obj/item/reagent_containers/food/snacks/candy_corn,
/obj/item/reagent_containers/food/snacks/candy,
/obj/item/reagent_containers/food/snacks/candiedapple,
/obj/item/reagent_containers/food/snacks/chocolatebar,
/obj/item/organ/brain ) // OH GOD THIS ISN'T CANDY!
new type(src)
/obj/item/weapon/card/emag/halloween
/obj/item/card/emag/halloween
name = "hack-o'-lantern"
desc = "It's a pumpkin with a cryptographic sequencer sticking out."
icon_state = "hack_o_lantern"
code/modules/events/holiday/vday.dm
+11 -11
View File
@@ -15,9 +15,9 @@
/datum/round_event/valentines/start()
..()
for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
H.put_in_hands(new /obj/item/weapon/valentine)
var/obj/item/weapon/storage/backpack/b = locate() in H.contents
new /obj/item/weapon/reagent_containers/food/snacks/candyheart(b)
H.put_in_hands(new /obj/item/valentine)
var/obj/item/storage/backpack/b = locate() in H.contents
new /obj/item/reagent_containers/food/snacks/candyheart(b)
var/list/valentines = list()
@@ -64,7 +64,7 @@
/datum/round_event/valentines/announce()
priority_announce("It's Valentine's Day! Give a valentine to that special someone!")
/obj/item/weapon/valentine
/obj/item/valentine
name = "valentine"
desc = "A Valentine's card! Wonder what it says..."
icon = 'icons/obj/toy.dmi'
@@ -73,7 +73,7 @@
resistance_flags = FLAMMABLE
w_class = WEIGHT_CLASS_TINY
/obj/item/weapon/valentine/New()
/obj/item/valentine/New()
..()
message = pick("Roses are red / Violets are good / One day while Andy...",
"My love for you is like the singularity. It cannot be contained.",
@@ -126,15 +126,15 @@
"Not even sorium can drive me away from you.",
"Wanna make like a borg and do some heavy petting?" )
/obj/item/weapon/valentine/attackby(obj/item/weapon/W, mob/user, params)
/obj/item/valentine/attackby(obj/item/W, mob/user, params)
..()
if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/toy/crayon))
if(istype(W, /obj/item/pen) || istype(W, /obj/item/toy/crayon))
var/recipient = stripped_input(user, "Who is receiving this valentine?", "To:", null , 20)
var/sender = stripped_input(user, "Who is sending this valentine?", "From:", null , 20)
if(recipient && sender)
name = "valentine - To: [recipient] From: [sender]"
/obj/item/weapon/valentine/examine(mob/user)
/obj/item/valentine/examine(mob/user)
if(in_range(user, src) || isobserver(user))
if( !(ishuman(user) || isobserver(user) || issilicon(user)) )
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(message)]</BODY></HTML>", "window=[name]")
@@ -145,10 +145,10 @@
else
to_chat(user, "<span class='notice'>It is too far away.</span>")
/obj/item/weapon/valentine/attack_self(mob/user)
/obj/item/valentine/attack_self(mob/user)
user.examinate(src)
/obj/item/weapon/reagent_containers/food/snacks/candyheart
/obj/item/reagent_containers/food/snacks/candyheart
name = "candy heart"
icon = 'icons/obj/holiday_misc.dmi'
icon_state = "candyheart"
@@ -156,7 +156,7 @@
list_reagents = list("sugar" = 2)
junkiness = 5
/obj/item/weapon/reagent_containers/food/snacks/candyheart/New()
/obj/item/reagent_containers/food/snacks/candyheart/New()
..()
desc = pick("A heart-shaped candy that reads: HONK ME",
"A heart-shaped candy that reads: ERP",
code/modules/events/holiday/xmas.dm
+10 -10
View File
@@ -29,7 +29,7 @@
continue
for(var/turf/open/floor/T in orange(1,xmas))
for(var/i=1,i<=rand(1,5),i++)
new /obj/item/weapon/a_gift(T)
new /obj/item/a_gift(T)
for(var/mob/living/simple_animal/pet/dog/corgi/Ian/Ian in GLOB.mob_list)
Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian))
for(var/obj/machinery/computer/security/telescreen/entertainment/Monitor in GLOB.machines)
@@ -39,17 +39,17 @@
priority_announce("Ho Ho Ho, Merry Xmas!", "Unknown Transmission")
/obj/item/weapon/toy/xmas_cracker
/obj/item/toy/xmas_cracker
name = "xmas cracker"
icon = 'icons/obj/christmas.dmi'
icon_state = "cracker"
desc = "Directions for use: Requires two people, one to pull each end."
var/cracked = 0
/obj/item/weapon/toy/xmas_cracker/attack(mob/target, mob/user)
/obj/item/toy/xmas_cracker/attack(mob/target, mob/user)
if( !cracked && ishuman(target) && (target.stat == CONSCIOUS) && !target.get_active_held_item() )
target.visible_message("[user] and [target] pop \an [src]! *pop*", "<span class='notice'>You pull \an [src] with [target]! *pop*</span>", "<span class='italics'>You hear a pop.</span>")
var/obj/item/weapon/paper/Joke = new /obj/item/weapon/paper(user.loc)
var/obj/item/paper/Joke = new /obj/item/paper(user.loc)
Joke.name = "[pick("awful","terrible","unfunny")] joke"
Joke.info = pick("What did one snowman say to the other?\n\n<i>'Is it me or can you smell carrots?'</i>",
"Why couldn't the snowman get laid?\n\n<i>He was frigid!</i>",
@@ -65,7 +65,7 @@
user.update_icons()
cracked = 1
icon_state = "cracker1"
var/obj/item/weapon/toy/xmas_cracker/other_half = new /obj/item/weapon/toy/xmas_cracker(target)
var/obj/item/toy/xmas_cracker/other_half = new /obj/item/toy/xmas_cracker(target)
other_half.cracked = 1
other_half.icon_state = "cracker2"
target.put_in_active_hand(other_half)
@@ -134,12 +134,12 @@
santa.equip_to_slot_or_del(new /obj/item/clothing/mask/breath, slot_wear_mask)
santa.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/red, slot_gloves)
santa.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/red, slot_shoes)
santa.equip_to_slot_or_del(new /obj/item/weapon/tank/internals/emergency_oxygen/double, slot_belt)
santa.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen/double, slot_belt)
santa.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain, slot_ears)
santa.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/santabag, slot_back)
santa.equip_to_slot_or_del(new /obj/item/storage/backpack/santabag, slot_back)
santa.equip_to_slot_or_del(new /obj/item/device/flashlight, slot_r_store) //most blob spawn locations are really dark.
var/obj/item/weapon/card/id/gold/santacard = new(santa)
var/obj/item/card/id/gold/santacard = new(santa)
santacard.update_label("Santa Claus", "Santa")
var/datum/job/captain/J = new/datum/job/captain
santacard.access = J.get_access()
@@ -147,8 +147,8 @@
santa.update_icons()
var/obj/item/weapon/storage/backpack/bag = santa.back
var/obj/item/weapon/a_gift/gift = new(santa)
var/obj/item/storage/backpack/bag = santa.back
var/obj/item/a_gift/gift = new(santa)
while(bag.can_be_inserted(gift, 1))
bag.handle_item_insertion(gift, 1)
gift = new(santa)
code/modules/events/shuttle_loan.dm
+6 -6
View File
@@ -135,20 +135,20 @@
new /obj/structure/spider/stickyweb(T)
if(ANTIDOTE_NEEDED)
var/obj/item/weapon/reagent_containers/glass/bottle/virus_type = pick(/obj/item/weapon/reagent_containers/glass/bottle/beesease, /obj/item/weapon/reagent_containers/glass/bottle/brainrot, /obj/item/weapon/reagent_containers/glass/bottle/fluspanish)
var/obj/item/reagent_containers/glass/bottle/virus_type = pick(/obj/item/reagent_containers/glass/bottle/beesease, /obj/item/reagent_containers/glass/bottle/brainrot, /obj/item/reagent_containers/glass/bottle/fluspanish)
var/turf/T
for(var/i=0, i<10, i++)
if(prob(15))
shuttle_spawns.Add(/obj/item/weapon/reagent_containers/glass/bottle)
shuttle_spawns.Add(/obj/item/reagent_containers/glass/bottle)
else if(prob(15))
shuttle_spawns.Add(/obj/item/weapon/reagent_containers/syringe)
shuttle_spawns.Add(/obj/item/reagent_containers/syringe)
else if(prob(25))
shuttle_spawns.Add(/obj/item/weapon/shard)
shuttle_spawns.Add(/obj/item/shard)
T = pick_n_take(empty_shuttle_turfs)
new virus_type(T)
shuttle_spawns.Add(/obj/structure/closet/crate)
shuttle_spawns.Add(/obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat)
shuttle_spawns.Add(/obj/item/weapon/reagent_containers/glass/bottle/magnitis)
shuttle_spawns.Add(/obj/item/reagent_containers/glass/bottle/pierrot_throat)
shuttle_spawns.Add(/obj/item/reagent_containers/glass/bottle/magnitis)
if(DEPARTMENT_RESUPPLY)
var/list/crate_types = list(
code/modules/events/wizard/curseditems.dm
+1 -1
View File
@@ -22,7 +22,7 @@
loadout = list(/obj/item/clothing/suit/wizrobe, /obj/item/clothing/shoes/sandal/magic, /obj/item/clothing/head/wizard)
ruins_spaceworthiness = 1
if("swords")
loadout[5] = /obj/item/weapon/katana/cursed
loadout[5] = /obj/item/katana/cursed
if("bigfatdoobie")
loadout[4] = /obj/item/clothing/mask/cigarette/rollie/trippy
ruins_spaceworthiness = 1
code/modules/events/wizard/greentext.dm
+8 -8
View File
@@ -15,11 +15,11 @@
return 0
var/mob/living/carbon/human/H = pick(holder_canadates)
new /obj/item/weapon/greentext(H.loc)
new /obj/item/greentext(H.loc)
to_chat(H, "<font color='green'>The mythical greentext appear at your feet! Pick it up if you dare...</font>")
/obj/item/weapon/greentext
/obj/item/greentext
name = "greentext"
desc = "No one knows what this massive tome does, but it feels <i><font color='green'>desirable</font></i> all the same..."
w_class = WEIGHT_CLASS_BULKY
@@ -31,11 +31,11 @@
resistance_flags = FIRE_PROOF | ACID_PROOF
var/quiet = FALSE
/obj/item/weapon/greentext/New()
/obj/item/greentext/New()
..()
GLOB.poi_list |= src
/obj/item/weapon/greentext/equipped(mob/living/user as mob)
/obj/item/greentext/equipped(mob/living/user as mob)
to_chat(user, "<font color='green'>So long as you leave this place with greentext in hand you know will be happy...</font>")
if(user.mind && user.mind.objectives.len > 0)
to_chat(user, "<span class='warning'>... so long as you still perform your other objectives that is!</span>")
@@ -48,7 +48,7 @@
START_PROCESSING(SSobj, src)
..()
/obj/item/weapon/greentext/dropped(mob/living/user as mob)
/obj/item/greentext/dropped(mob/living/user as mob)
if(user in color_altered_mobs)
to_chat(user, "<span class='warning'>A sudden wave of failure washes over you...</span>")
user.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY) //ya blew it
@@ -57,7 +57,7 @@
STOP_PROCESSING(SSobj, src)
..()
/obj/item/weapon/greentext/process()
/obj/item/greentext/process()
if(new_holder && new_holder.z == ZLEVEL_CENTCOM)//you're winner!
to_chat(new_holder, "<font color='green'>At last it feels like victory is assured!</font>")
if(!(new_holder in SSticker.mode.traitors))
@@ -77,7 +77,7 @@
last_holder.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY)
last_holder = new_holder //long live the king
/obj/item/weapon/greentext/Destroy(force)
/obj/item/greentext/Destroy(force)
if(!(resistance_flags & ON_FIRE) && !force)
return QDEL_HINT_LETMELIVE
@@ -94,5 +94,5 @@
if(!quiet)
to_chat(M, message)
/obj/item/weapon/greentext/quiet
/obj/item/greentext/quiet
quiet = TRUE
code/modules/events/wizard/rpgloot.dm
+2 -2
View File
@@ -11,8 +11,8 @@
if(!istype(I.rpg_loot))
I.rpg_loot = new(I)
if(istype(I, /obj/item/weapon/storage))
var/obj/item/weapon/storage/S = I
if(istype(I, /obj/item/storage))
var/obj/item/storage/S = I
if(prob(upgrade_scroll_chance) && S.contents.len < S.storage_slots && !S.invisibility)
var/obj/item/upgradescroll/scroll = new
S.handle_item_insertion(scroll,1)