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

12/21 modernizations from TG live (#103)

Browse Source 
* sync (#3)

* shuttle auto call

* Merge /vore into /master (#39)

* progress

* Compile errors fixed

No idea if it's test worthy tho as conflicts with race overhaul and
narky removal.

* Update admins.txt

* efforts continue

Fuck grab code, seriously

* grab code is cancer

* Execute the Narkism

Do not hesitate.

Show no mercy.

* holy shit grab code is awful

* have I bitched about grab code

My bitching, let me show you it

* código de agarre es una mierda

No really it is

* yeah I don't even know anymore.

* Lolnope. Fuck grab code

* I'm not even sure what to fix anymore

* Self eating is not an acceptable fate

* Taste the void, son.

* My code doesn't pass it's own sanity check.

Maybe it's a sign of things to come.

* uncommented and notes

* It Works and I Don't Know Why (#38)

* shuttle auto call

* it works and I don't know why

* Subsystem 12/21

Most Recent TG subsystem folder

* globalvars 12/21

Tossed out the flavor_misc and parallax files

* Onclick 12/21

as well as .dme updates

* _defines 12/21

ommited old _MC.dm

* _HELPERS 12/21

Preserved snowflake placement of furry sprites

* _defeines/genetics

reapplied narkism holdover for snowflake races.

* Oops forgot mutant colors

* modules porting 12/21 + Sounds/icons

Admin, Client and most of mob life files ommitted

* enviroment file

* Admin optimizations

ahelp log system kept

* Mob ports 12/21

Flavor text preserved

* datums ported 12/21

* Game ported 12/21

* batch of duplicate fixes/dogborg work

Dogborgs need to be modernized to refractored borg standards.

* moar fixes

* Maps and futher compile fixes
This commit is contained in:
Poojawa
2016-12-22 03:57:55 -06:00
committed by GitHub
parent f5e143a452
commit cf59ac1c3d
2215 changed files with 707445 additions and 87041 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holiday/easter.dm
+9 -9
View File
@@ -29,7 +29,7 @@
for(var/obj/effect/landmark/R in landmarks_list)
if(R.name != "blobspawn")
if(prob(35))
if(istype(R.loc,/turf/open/space))
if(isspaceturf(R.loc))
new /mob/living/simple_animal/chicken/rabbit/space(R.loc)
else
new /mob/living/simple_animal/chicken/rabbit(R.loc)
@@ -111,9 +111,9 @@
/obj/item/weapon/reagent_containers/food/snacks/egg/loaded/New()
..()
var/color = pick("blue","green","mime","orange","purple","rainbow","red","yellow")
icon_state = "egg-[color]"
item_color = "[color]"
var/eggcolor = pick("blue","green","mime","orange","purple","rainbow","red","yellow")
icon_state = "egg-[eggcolor]"
item_color = "[eggcolor]"
/obj/item/weapon/reagent_containers/food/snacks/egg/proc/dispensePrize(turf/where)
var/won = pick(/obj/item/clothing/head/bunnyhead,
@@ -158,7 +158,7 @@
/datum/reagent/consumable/sugar = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/hotcrossbun
category = CAT_FOOD
category = CAT_MISCFOOD
/obj/item/weapon/reagent_containers/food/snacks/store/cake/brioche
@@ -182,7 +182,7 @@
/datum/reagent/consumable/sugar = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/brioche
category = CAT_FOOD
category = CAT_MISCFOOD
/obj/item/weapon/reagent_containers/food/snacks/scotchegg
name = "scotch egg"
@@ -202,7 +202,7 @@
/obj/item/weapon/reagent_containers/food/snacks/faggot = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/scotchegg
category = CAT_FOOD
category = CAT_MISCFOOD
/obj/item/weapon/reagent_containers/food/snacks/soup/mammi
name = "Mammi"
@@ -219,7 +219,7 @@
/datum/reagent/consumable/milk = 5
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/mammi
category = CAT_FOOD
category = CAT_MISCFOOD
/obj/item/weapon/reagent_containers/food/snacks/chocolatebunny
name = "chocolate bunny"
@@ -236,4 +236,4 @@
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/chocolatebunny
category = CAT_FOOD
category = CAT_MISCFOOD
code/modules/holiday/halloween.dm
+25 -51
View File
@@ -1,34 +1,3 @@
//spooky halloween stuff. only tick on halloween!!!
//uses super seekrit double proc definition stuffs. remember to call ..()!
/*/mob/dead/observer/say(var/message) //this doesn't actually work vOv
..()
for(var/mob/M in hearers(src, 1))
if(!M.stat)
if(M.job == "Chaplain")
if (prob (49))
M.show_message("<span class='game'><i>You hear muffled speech... but nothing is there...</i></span>", 2)
if(prob(20))
playsound(loc, pick('sound/effects/ghost.ogg','sound/effects/ghost2.ogg'), 10, 1)
else
M.show_message("<span class='game'><i>You hear muffled speech... you can almost make out some words...</i></span>", 2)
// M.show_message("<span class='game'><i>[stutter(message)]</i></span>", 2)
if(prob(30))
playsound(loc, pick('sound/effects/ghost.ogg','sound/effects/ghost2.ogg'), 10, 1)
else
if(prob(50))
return
else if(prob (95))
M.show_message("<span class='game'><i>You hear muffled speech... but nothing is there...</i></span>", 2)
if(prob(20))
playsound(loc, pick('sound/effects/ghost.ogg','sound/effects/ghost2.ogg'), 10, 1)
else
M.show_message("<span class='game'><i>You hear muffled speech... you can almost make out some words...</i></span>", 2)
// M.show_message("<span class='game'><i>[stutter(message)]</i></span>", 2)
playsound(loc, pick('sound/effects/ghost.ogg','sound/effects/ghost2.ogg'), 10, 1)*/
///////////////////////////////////////
///////////HALLOWEEN CONTENT///////////
///////////////////////////////////////
@@ -102,14 +71,9 @@
else if(trapped == SPOOKY_SKELETON)
visible_message("<span class='userdanger'><font size='5'>BOO!</font></span>")
playsound(loc, pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg','sound/spookoween/girlscream.ogg'), 300, 1)
playsound(loc, 'sound/spookoween/girlscream.ogg', 300, 1)
trapped = 0
spawn(90)
if(trapped_mob && trapped_mob.loc)
var/datum/effect/effect/system/harmless_smoke_spread/smoke = new()
smoke.set_up(1, 0, trapped_mob.loc, 0)
smoke.start()
qdel(trapped_mob)
QDEL_IN(trapped_mob, 90)
else if(trapped == HOWLING_GHOST)
visible_message("<span class='userdanger'><font size='5'>[pick("OooOOooooOOOoOoOOooooOOOOO", "BooOOooOooooOOOO", "BOO!", "WoOOoOoooOooo")]</font></span>")
@@ -130,21 +94,13 @@
visible_message("<span class='userdanger'><font size='5'>THIS BEING RADIATES PURE EVIL! YOU BETTER RUN!!!</font></span>")
playsound(loc, 'sound/hallucinations/wail.ogg', 300, 1)
var/mob/living/simple_animal/hostile/faithless/F = new(loc)
F.stance = HOSTILE_STANCE_ATTACK
F.GiveTarget(usr)
trapped = 0
spawn(120)
if(F && F.loc)
var/datum/effect/effect/system/harmless_smoke_spread/smoke = new
smoke.set_up(1,0, F.loc, 0)
smoke.start()
qdel(F)
QDEL_IN(F, 120)
else if(trapped == INSANE_CLOWN)
visible_message("<span class='userdanger'><font size='5'>...</font></span>")
playsound(loc, 'sound/spookoween/scary_clown_appear.ogg', 300, 1)
var/mob/living/simple_animal/hostile/retaliate/clown/insane/IC = new (loc)
IC.GiveTarget(usr)
spawn_atom_to_turf(/mob/living/simple_animal/hostile/retaliate/clown/insane, loc, 1, FALSE)
trapped = 0
//don't spawn in crates
@@ -267,9 +223,9 @@
loc = M.loc
/mob/living/simple_animal/hostile/retaliate/clown/insane/MoveToTarget()
return
stalk(target)
/mob/living/simple_animal/hostile/retaliate/clown/insane/AttackTarget()
/mob/living/simple_animal/hostile/retaliate/clown/insane/AttackingTarget()
return
/mob/living/simple_animal/hostile/retaliate/clown/insane/adjustHealth()
@@ -289,4 +245,22 @@
..()
/mob/living/simple_animal/hostile/retaliate/clown/insane/handle_temperature_damage()
return
return
/////////////////////////
// Spooky Uplink Items //
/////////////////////////
/datum/uplink_item/dangerous/crossbow/candy
name = "Candy Corn Crossbow"
desc = "A standard miniature energy crossbow that uses a hard-light projector to transform bolts into candy corn. Happy Halloween!"
category = "Holiday"
item = /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/halloween
surplus = 0
/datum/uplink_item/device_tools/emag/hack_o_lantern
name = "Hack-o'-Lantern"
desc = "An emag fitted to support the Halloween season. Candle not included."
category = "Holiday"
item = /obj/item/weapon/card/emag/halloween
surplus = 0
code/modules/holiday/holidays.dm
+19
View File
@@ -302,6 +302,11 @@
begin_day = 14
begin_month = DECEMBER
/datum/holiday/doomsday
name = "Mayan Doomsday Anniversary"
begin_day = 21
begin_month = DECEMBER
/datum/holiday/xmas
name = CHRISTMAS
begin_day = 23
@@ -311,6 +316,20 @@
/datum/holiday/xmas/greet()
return "Have a merry Christmas!"
/datum/holiday/festive_season
name = FESTIVE_SEASON
begin_day = 1
begin_month = DECEMBER
end_day = 31
/datum/holiday/festive_season/celebrate()
for(var/obj/effect/landmark/xmastree/XT in landmarks_list)
new XT.tree(get_turf(XT))
qdel(XT)
/datum/holiday/festive_season/greet()
return "Have a nice festive season!"
/datum/holiday/boxing
name = "Boxing Day"
begin_day = 26