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 tggenetics

Browse Source
This commit is contained in:
Seris02
2020-02-22 19:54:10 +08:00
parent 88ae429720 d4e1c30597
commit c3ec44b0d0
701 changed files with 12663 additions and 5550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/admin/chat_commands.dm
+7
View File
@@ -14,6 +14,13 @@
saltresult += "[saltprimarysubject] [saltsecondarysubject]"
return "[saltresult]!"
/datum/tgs_chat_command/valentine
name = "valentine"
help_text = "Get a random flirt line."
/datum/tgs_chat_command/valentine/Run(datum/tgs_chat_user/sender, params)
return "[pick(GLOB.flirts)]"
/datum/tgs_chat_command/despacito
name = "despacito" //someone please high effort this sometime and make it a full on ytdl search
help_text = "This is so sad."
modular_citadel/code/modules/arousal/genitals.dm
+7 -7
View File
@@ -20,16 +20,13 @@
var/linked_organ_slot //used for linking an apparatus' organ to its other half on update_link().
var/layer_index = GENITAL_LAYER_INDEX //Order should be very important. FIRST vagina, THEN testicles, THEN penis, as this affects the order they are rendered in.
/obj/item/organ/genital/Initialize(mapload, mob/living/carbon/human/H)
/obj/item/organ/genital/Initialize(mapload, do_update = TRUE)
. = ..()
if(fluid_id)
create_reagents(fluid_max_volume)
create_reagents(fluid_max_volume, NONE, NO_REAGENTS_VALUE)
if(CHECK_BITFIELD(genital_flags, GENITAL_FUID_PRODUCTION))
reagents.add_reagent(fluid_id, fluid_max_volume)
if(H)
get_features(H)
Insert(H)
else
if(do_update)
update()
/obj/item/organ/genital/proc/set_aroused_state(new_state)
@@ -221,7 +218,9 @@
/mob/living/carbon/human/proc/give_genital(obj/item/organ/genital/G)
if(!dna || (NOGENITALS in dna.species.species_traits) || getorganslot(initial(G.slot)))
return FALSE
G = new G(null, src)
G = new G(null, FALSE)
G.get_features(src)
G.Insert(src)
return G
/obj/item/organ/genital/proc/get_features(mob/living/carbon/human/H)
@@ -317,6 +316,7 @@
genital_overlay.layer = -GENITALS_EXPOSED_LAYER
LAZYADD(fully_exposed, genital_overlay) // to be added to a layer with higher priority than clothes, hence the name of the bitflag.
else
genital_overlay.layer = -layers_num[layer]
standing += genital_overlay
if(LAZYLEN(standing))
modular_citadel/code/modules/arousal/organs/breasts.dm
+2 -2
View File
@@ -22,8 +22,8 @@
var/cached_size //these two vars pertain size modifications and so should be expressed in NUMBERS.
var/prev_size //former cached_size value, to allow update_size() to early return should be there no significant changes.
/obj/item/organ/genital/breasts/Initialize(mapload, mob/living/carbon/human/H)
if(!H)
/obj/item/organ/genital/breasts/Initialize(mapload, do_update = TRUE)
if(do_update)
cached_size = breast_values[size]
prev_size = cached_size
return ..()
modular_citadel/code/modules/mob/cit_emotes.dm
+4 -7
View File
@@ -14,13 +14,10 @@
emote_type = EMOTE_AUDIBLE
/datum/emote/living/insult/run_emote(mob/living/user, params)
var/insult_message = ""
var/miming = user.mind ? user.mind.miming : 0
if(!user.is_muzzled())
insult_message += pick_list_replacements(INSULTS_FILE, "insult_gen")
message = insult_message
else if(miming)
if(user.mind?.miming)
message = "creatively gesticulates."
else if(!user.is_muzzled())
message = pick_list_replacements(INSULTS_FILE, "insult_gen")
else
message = "muffles something."
. = ..()
@@ -36,7 +33,7 @@
sound = 'modular_citadel/sound/voice/scream_silicon.ogg'
if(iscyborg(user))
var/mob/living/silicon/robot/S = user
if(S.cell.charge < 20)
if(S.cell?.charge < 20)
to_chat(S, "<span class='warning'>Scream module deactivated. Please recharge.</span>")
return
S.cell.use(200)
modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm
Vendored
+9 -9
View File
@@ -3,7 +3,7 @@
desc = "A gun magazine. Loaded with rounds which ignite the target.."
id = "10mminc"
build_type = PROTOLATHE
materials = list(MAT_PLASMA = 50000, MAT_METAL = 18000)
materials = list(/datum/material/plasma = 50000, /datum/material/iron = 18000)
reagents_list = list(/datum/reagent/toxin/plasma = 120, /datum/reagent/napalm = 240)
build_path = /obj/item/ammo_box/magazine/m10mm/fire
category = list("Weapons")
@@ -14,7 +14,7 @@
desc = "A gun magazine."
id = "10mm"
build_type = PROTOLATHE
materials = list(MAT_METAL = 55000)
materials = list(/datum/material/iron = 55000)
build_path = /obj/item/ammo_box/magazine/m10mm
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -24,7 +24,7 @@
desc = "A gun magazine. Loaded with hollow-point rounds, extremely effective against unarmored targets, but nearly useless against protective clothing."
id = "10mmhp"
build_type = PROTOLATHE
materials = list(MAT_METAL = 40000, MAT_GLASS = 50000)
materials = list(/datum/material/iron = 40000, /datum/material/glass = 50000)
reagents_list = list(/datum/reagent/sonic_powder = 280)
build_path = /obj/item/ammo_box/magazine/m10mm/hp
category = list("Ammo")
@@ -35,7 +35,7 @@
desc = "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets."
id = "10mmap"
build_type = PROTOLATHE
materials = list(MAT_METAL = 40000, MAT_TITANIUM = 60000)
materials = list(/datum/material/iron = 40000, /datum/material/titanium = 60000)
build_path = /obj/item/ammo_box/magazine/m10mm/ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -45,7 +45,7 @@
desc = "A stripper clip used to quickly load bolt action rifles. Contains 5 rounds."
id = "bolt_clip"
build_type = PROTOLATHE
materials = list(MAT_METAL = 8000)
materials = list(/datum/material/iron = 8000)
build_path = /obj/item/ammo_box/a762
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -54,7 +54,7 @@
name = "handgun magazine (.45)"
id = "m45"
build_type = PROTOLATHE
materials = list(MAT_METAL = 80000)
materials = list(/datum/material/iron = 80000)
build_path = /obj/item/ammo_box/magazine/m45
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -64,7 +64,7 @@
desc = "A gun magazine."
id = "pistolm9mm"
build_type = PROTOLATHE
materials = list(MAT_METAL = 80000)
materials = list(/datum/material/iron = 80000)
build_path = /obj/item/ammo_box/magazine/pistolm9mm
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -74,7 +74,7 @@
desc = "A revolver speedloader."
id = "sl357"
build_type = PROTOLATHE
materials = list(MAT_METAL = 30000)
materials = list(/datum/material/iron = 30000)
build_path = /obj/item/ammo_box/a357
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -84,7 +84,7 @@
desc = "A revolver speedloader. Cuts through like a hot knife through butter."
id = "sl357ap"
build_type = PROTOLATHE
materials = list(MAT_METAL = 30000, MAT_TITANIUM = 45000)
materials = list(/datum/material/iron = 30000, /datum/material/titanium = 45000)
build_path = /obj/item/ammo_box/a357/ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
+4 -4
View File
@@ -24,7 +24,7 @@
icon_state = "toy9magazine"
max_ammo = 30
multiple_sprites = 2
materials = list(MAT_METAL = 200)
custom_materials = list(/datum/material/iron = 200)
/obj/item/gun/ballistic/automatic/x9/toy
name = "\improper Foam Force X9"
@@ -65,7 +65,7 @@
icon_state = "toy9magazine"
max_ammo = 30
multiple_sprites = 2
materials = list(MAT_METAL = 200)
custom_materials = list(/datum/material/iron = 200)
/obj/item/gun/ballistic/automatic/x9/toy
name = "\improper Foam Force X9"
@@ -201,7 +201,7 @@
icon_state = "AM4MAG-60"
max_ammo = 60
multiple_sprites = 0
materials = list(MAT_METAL = 200)
custom_materials = list(/datum/material/iron = 200)
/obj/item/gun/ballistic/automatic/AM4B
name = "AM4-B"
@@ -253,7 +253,7 @@
icon_state = "AM4MAG-32"
max_ammo = 32
multiple_sprites = 0
materials = list(MAT_METAL = 200)
custom_materials = list(/datum/material/iron = 200)
/obj/item/gun/ballistic/automatic/AM4C
name = "AM4-C"
modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm
-4
View File
@@ -1,7 +1,3 @@
/obj/item/gun/energy/e_gun
name = "blaster carbine"
desc = "A high powered particle blaster carbine with varitable setting for stunning or lethal applications."
/*/////////////////////////////////////////////////////////////////////////////////////////////
The Recolourable Energy Gun
*//////////////////////////////////////////////////////////////////////////////////////////////
modular_citadel/code/modules/projectiles/guns/energy/laser.dm
-11
View File
@@ -1,11 +0,0 @@
/obj/item/gun/energy/laser
name = "blaster rifle"
desc = "a high energy particle blaster, efficient and deadly."
/obj/item/gun/energy/laser/practice
icon = 'modular_citadel/icons/obj/guns/energy.dmi'
icon_state = "laser-p"
lefthand_file = 'modular_citadel/icons/mob/inhands/OVERRIDE_guns_lefthand.dmi'
righthand_file = 'modular_citadel/icons/mob/inhands/OVERRIDE_guns_righthand.dmi'
ammo_x_offset = 1
shaded_charge = 1
modular_citadel/code/modules/projectiles/guns/toys.dm
+2 -2
View File
@@ -57,7 +57,7 @@
desc = "An authentic cap-firing reproduction of a F3 Justicar big-bore revolver! Pretend to blow your friend's brains out with this 100% safe toy! Satisfaction guaranteed!"
icon_state = "justicar"
icon = 'modular_citadel/icons/obj/guns/toys.dmi'
materials = list(MAT_METAL=2000, MAT_GLASS=250)
custom_materials = list(/datum/material/iron=2000, /datum/material/glass=250)
/obj/item/toy/gun/m41
@@ -65,4 +65,4 @@
desc = "A toy replica of the Corporate Mercenaries' standard issue rifle. For Avtomat is inscribed on the side."
icon_state = "toym41"
icon = 'modular_citadel/icons/obj/guns/toys.dmi'
materials = list(MAT_METAL=2000, MAT_GLASS=250)
custom_materials = list(/datum/material/iron=2000, /datum/material/glass=250)