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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits

Browse Source
This commit is contained in:
Putnam3145
2022-05-17 13:22:40 -07:00
parent d5c36b4a99 35f86287e2
commit 33889870c9
1311 changed files with 12771 additions and 10321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/friendly/bumbles.dm
+1 -1
View File
@@ -31,7 +31,7 @@
speak_chance = 1
unique_name = FALSE
/mob/living/simple_animal/pet/bumbles/Initialize()
/mob/living/simple_animal/pet/bumbles/Initialize(mapload)
. = ..()
add_verb(src, /mob/living/proc/lay_down)
AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
code/modules/mob/living/simple_animal/friendly/butterfly.dm
+1 -1
View File
@@ -28,7 +28,7 @@
verb_exclaim = "flutters intensely"
verb_yell = "flutters intensely"
/mob/living/simple_animal/butterfly/Initialize()
/mob/living/simple_animal/butterfly/Initialize(mapload)
. = ..()
var/newcolor = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
code/modules/mob/living/simple_animal/friendly/cat.dm
+2 -2
View File
@@ -36,7 +36,7 @@
var/held_icon = "cat2"
footstep_type = FOOTSTEP_MOB_CLAW
/mob/living/simple_animal/pet/cat/Initialize()
/mob/living/simple_animal/pet/cat/Initialize(mapload)
. = ..()
add_verb(src, /mob/living/proc/lay_down)
AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
@@ -107,7 +107,7 @@
var/cats_deployed = 0
var/memory_saved = FALSE
/mob/living/simple_animal/pet/cat/Runtime/Initialize()
/mob/living/simple_animal/pet/cat/Runtime/Initialize(mapload)
if(prob(5))
icon_state = "original"
icon_living = "original"
code/modules/mob/living/simple_animal/friendly/cockroach.dm
+1 -1
View File
@@ -31,7 +31,7 @@
var/squish_chance = 50
del_on_death = 1
/mob/living/simple_animal/cockroach/Initialize()
/mob/living/simple_animal/cockroach/Initialize(mapload)
. = ..()
AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
code/modules/mob/living/simple_animal/friendly/crab.dm
+1 -1
View File
@@ -26,7 +26,7 @@
var/obj/item/inventory_mask
gold_core_spawnable = FRIENDLY_SPAWN
/mob/living/simple_animal/crab/Initialize()
/mob/living/simple_animal/crab/Initialize(mapload)
. = ..()
AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
code/modules/mob/living/simple_animal/friendly/dog.dm
+4 -4
View File
@@ -84,7 +84,7 @@
animal_species = /mob/living/simple_animal/pet/dog/corgi/exoticcorgi
nofur = TRUE
/mob/living/simple_animal/pet/dog/Initialize()
/mob/living/simple_animal/pet/dog/Initialize(mapload)
. = ..()
var/dog_area = get_area(src)
for(var/obj/structure/bed/dogbed/D in dog_area)
@@ -92,11 +92,11 @@
D.update_owner(src)
break
/mob/living/simple_animal/pet/dog/corgi/Initialize()
/mob/living/simple_animal/pet/dog/corgi/Initialize(mapload)
. = ..()
regenerate_icons()
/mob/living/simple_animal/pet/dog/corgi/exoticcorgi/Initialize()
/mob/living/simple_animal/pet/dog/corgi/exoticcorgi/Initialize(mapload)
. = ..()
var/newcolor = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
@@ -400,7 +400,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
var/memory_saved = FALSE
var/saved_head //path
/mob/living/simple_animal/pet/dog/corgi/Ian/Initialize()
/mob/living/simple_animal/pet/dog/corgi/Ian/Initialize(mapload)
. = ..()
//parent call must happen first to ensure IAN
//is not in nullspace when child puppies spawn
code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+7 -1
View File
@@ -79,7 +79,7 @@
"<span class='warning'>These rules are at admin discretion and will be heavily enforced.</span>\n"+\
"<span class='warning'><u>If you do not have the regular drone laws, follow your laws to the best of your ability.</u></span>"
/mob/living/simple_animal/drone/Initialize()
/mob/living/simple_animal/drone/Initialize(mapload)
. = ..()
GLOB.drones_list += src
access_card = new /obj/item/card/id(src)
@@ -140,6 +140,12 @@
if(!picked)
pickVisualAppearence()
/mob/living/simple_animal/drone/auto_deadmin_on_login()
if(!client?.holder)
return TRUE
if(CONFIG_GET(flag/auto_deadmin_silicons) || (client.prefs?.deadmin & DEADMIN_POSITION_SILICON))
return client.holder.auto_deadmin()
return ..()
/mob/living/simple_animal/drone/death(gibbed)
..(gibbed)
code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
+1 -1
View File
@@ -17,7 +17,7 @@
var/seasonal_hats = TRUE //If TRUE, and there are no default hats, different holidays will grant different hats
var/static/list/possible_seasonal_hats //This is built automatically in build_seasonal_hats() but can also be edited by admins!
/obj/item/drone_shell/Initialize()
/obj/item/drone_shell/Initialize(mapload)
. = ..()
var/area/A = get_area(src)
if(A)
code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
+5 -5
View File
@@ -31,7 +31,7 @@
hacked = TRUE
flavortext = null
/mob/living/simple_animal/drone/syndrone/Initialize()
/mob/living/simple_animal/drone/syndrone/Initialize(mapload)
. = ..()
var/datum/component/uplink/hidden_uplink = internal_storage.GetComponent(/datum/component/uplink)
hidden_uplink.telecrystals = 10
@@ -45,7 +45,7 @@
default_hatmask = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite
default_storage = /obj/item/uplink/nuclear
/mob/living/simple_animal/drone/syndrone/badass/Initialize()
/mob/living/simple_animal/drone/syndrone/badass/Initialize(mapload)
. = ..()
var/datum/component/uplink/hidden_uplink = internal_storage.GetComponent(/datum/component/uplink)
hidden_uplink.telecrystals = 30
@@ -55,7 +55,7 @@
/mob/living/simple_animal/drone/snowflake
default_hatmask = /obj/item/clothing/head/chameleon/drone
/mob/living/simple_animal/drone/snowflake/Initialize()
/mob/living/simple_animal/drone/snowflake/Initialize(mapload)
. = ..()
desc += " This drone appears to have a complex holoprojector built on its 'head'."
@@ -79,7 +79,7 @@
default_hatmask = null
picked = TRUE
/mob/living/simple_animal/drone/polymorphed/Initialize()
/mob/living/simple_animal/drone/polymorphed/Initialize(mapload)
. = ..()
liberate()
visualAppearence = pick(MAINTDRONE, REPAIRDRONE, SCOUTDRONE)
@@ -136,7 +136,7 @@
/mob/living/simple_animal/drone/cogscarab/admin //an admin-only subtype of cogscarab with a no-cost fabricator and slab in its box
default_storage = /obj/item/storage/toolbox/brass/prefilled/ratvar/admin
/mob/living/simple_animal/drone/cogscarab/Initialize()
/mob/living/simple_animal/drone/cogscarab/Initialize(mapload)
. = ..()
set_light(2, 0.5)
qdel(access_card) //we don't have free access
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+9 -9
View File
@@ -37,7 +37,7 @@
footstep_type = FOOTSTEP_MOB_SHOE
/mob/living/simple_animal/hostile/retaliate/goat/Initialize(/datum/reagent/milk_reagent)
/mob/living/simple_animal/hostile/retaliate/goat/Initialize(mapload, /datum/reagent/milk_reagent)
udder = new (null, milk_reagent)
. = ..()
@@ -144,7 +144,7 @@
footstep_type = FOOTSTEP_MOB_SHOE
/mob/living/simple_animal/cow/Initialize()
/mob/living/simple_animal/cow/Initialize(mapload)
udder = new(null, milk_reagent)
. = ..()
@@ -197,7 +197,7 @@
name = "strange cow"
desc = "Something seems off about the milk this cow is producing."
/mob/living/simple_animal/cow/random/Initialize()
/mob/living/simple_animal/cow/random/Initialize(mapload)
milk_reagent = get_random_reagent_id() //this has a blacklist so don't worry about romerol cows, etc
..()
@@ -210,7 +210,7 @@
speak_chance = 10 //the cow is eager to share its wisdom! //but is wise enough to not lag the server too bad
milk_reagent = /datum/reagent/medicine/liquid_wisdom
/mob/living/simple_animal/cow/wisdom/Initialize()
/mob/living/simple_animal/cow/wisdom/Initialize(mapload)
. = ..()
speak = GLOB.wisdoms //Done here so it's setup properly
@@ -248,7 +248,7 @@
footstep_type = FOOTSTEP_MOB_CLAW
/mob/living/simple_animal/chick/Initialize()
/mob/living/simple_animal/chick/Initialize(mapload)
. = ..()
pixel_x = rand(-6, 6)
pixel_y = rand(0, 10)
@@ -310,7 +310,7 @@
footstep_type = FOOTSTEP_MOB_CLAW
/mob/living/simple_animal/chicken/Initialize()
/mob/living/simple_animal/chicken/Initialize(mapload)
. = ..()
if(!body_color)
body_color = pick(validColors)
@@ -408,7 +408,7 @@
--kiwi_count
return ..()
/mob/living/simple_animal/kiwi/Initialize()
/mob/living/simple_animal/kiwi/Initialize(mapload)
. = ..()
++kiwi_count
@@ -482,7 +482,7 @@
footstep_type = FOOTSTEP_MOB_CLAW
/mob/living/simple_animal/babyKiwi/Initialize()
/mob/living/simple_animal/babyKiwi/Initialize(mapload)
. = ..()
pixel_x = rand(-6, 6)
pixel_y = rand(0, 10)
@@ -506,7 +506,7 @@
/obj/item/udder
name = "udder"
/obj/item/udder/Initialize(loc, milk_reagent)
/obj/item/udder/Initialize(mapload, loc, milk_reagent)
if(!milk_reagent)
milk_reagent = /datum/reagent/consumable/milk
create_reagents(50, NONE, NO_REAGENTS_VALUE)
code/modules/mob/living/simple_animal/friendly/gondola.dm
+1 -1
View File
@@ -31,7 +31,7 @@
//Gondolas don't make footstep sounds
/mob/living/simple_animal/pet/gondola/Initialize()
/mob/living/simple_animal/pet/gondola/Initialize(mapload)
. = ..()
if (!(istype(src, /mob/living/simple_animal/pet/gondola/gondolapod)))
CreateGondola()
code/modules/mob/living/simple_animal/friendly/mouse.dm
+2 -2
View File
@@ -30,7 +30,7 @@
var/chew_probability = 1
faction = list("rat")
/mob/living/simple_animal/mouse/Initialize()
/mob/living/simple_animal/mouse/Initialize(mapload)
. = ..()
AddComponent(/datum/component/squeak, list('sound/effects/mousesqueek.ogg'=1), 100)
if(!body_color)
@@ -174,7 +174,7 @@ GLOBAL_VAR(tom_existed)
desc = "Jerry the cat is not amused."
gold_core_spawnable = NO_SPAWN
/mob/living/simple_animal/mouse/brown/Tom/Initialize()
/mob/living/simple_animal/mouse/brown/Tom/Initialize(mapload)
. = ..()
GLOB.tom_existed = TRUE
code/modules/mob/living/simple_animal/friendly/pet.dm
+1 -1
View File
@@ -38,7 +38,7 @@
else
..()
/mob/living/simple_animal/pet/Initialize()
/mob/living/simple_animal/pet/Initialize(mapload)
. = ..()
if(pcollar)
pcollar = new(src)
code/modules/mob/living/simple_animal/friendly/possum.dm
+1 -1
View File
@@ -27,7 +27,7 @@
mob_biotypes = MOB_ORGANIC|MOB_BEAST
gold_core_spawnable = FRIENDLY_SPAWN
/mob/living/simple_animal/opossum/Initialize()
/mob/living/simple_animal/opossum/Initialize(mapload)
. = ..()
AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
code/modules/mob/living/simple_animal/friendly/snake.dm
+1 -1
View File
@@ -38,7 +38,7 @@
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
/mob/living/simple_animal/hostile/retaliate/poison/snake/Initialize()
/mob/living/simple_animal/hostile/retaliate/poison/snake/Initialize(mapload)
. = ..()
AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)