Skip to content
This repository has been archived by the owner on Nov 11, 2021. It is now read-only.

Commit

Permalink
чищу билд
Browse files Browse the repository at this point in the history
  • Loading branch information
RedFoxIV committed Feb 14, 2022
1 parent cbeeab9 commit 5c1495b
Show file tree
Hide file tree
Showing 25 changed files with 74 additions and 1,524 deletions.
13 changes: 0 additions & 13 deletions code/datums/world_topic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -371,16 +371,3 @@
var/no_err = query_set_donate.Execute()
qdel(query_set_donate)
return no_err

/**
* Отправляет негра с хуем пользователю
* delete_after: удаление негра через n-секунд
*/
/proc/penetrate_retard(userkey, delete_after = 10)
for(var/client/C in GLOB.clients)
if(userkey == C.ckey)
if(isliving(C.mob))
var/mob/L = new /mob/living/carbon/human/raper(get_turf(C.mob))
QDEL_IN(L, delete_after SECONDS)
return TRUE
return FALSE
5 changes: 0 additions & 5 deletions code/game/objects/items/storage/uplink_kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,3 @@
for(var/i in implants)
group.register(i)
desc += " The implants are registered to the \"[group.name]\" group."

/obj/item/storage/box/syndie_kit/cumvirus/PopulateContents()
new /obj/item/reagent_containers/glass/bottle/cumvirus(src)
new /obj/item/reagent_containers/syringe(src)
new /obj/item/reagent_containers/dropper(src)
2 changes: 0 additions & 2 deletions code/game/world.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ GLOBAL_VAR(restart_counter)

load_whitelist()

load_whitelist_exrp()

GLOB.timezoneOffset = text2num(time2text(0,"hh")) * 36000

if(fexists(RESTART_COUNTER_PATH))
Expand Down
15 changes: 5 additions & 10 deletions code/modules/mob/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,12 @@
return
if(isliving(user))
var/mob/living/flippy_mcgee = user
if(prob(90) && !(HAS_TRAIT(user, TRAIT_FREERUNNING)))
if(prob(75) && !(HAS_TRAIT(user, TRAIT_FREERUNNING)))
flippy_mcgee.Knockdown(5 SECONDS)
flippy_mcgee.visible_message(
span_notice("[flippy_mcgee] пытается сделать кувырок и падает на голову, во чудила!") ,
span_notice("Пытаюсь сделать изящный кувырок, но спотыкаюсь и падаю!")
)
if(prob(75))
flippy_mcgee.adjustBruteLoss(5)
if(prob(50))
var/obj/item/bodypart/neckflip = flippy_mcgee.get_bodypart(BODY_ZONE_HEAD)
neckflip.force_wound_upwards(/datum/wound/blunt/critical)
flippy_mcgee.visible_message( span_notice("[flippy_mcgee] пытается сделать кувырок и падает на голову, во чудила!") ,
span_notice("Пытаюсь сделать изящный кувырок, но спотыкаюсь и падаю!") )
flippy_mcgee.adjustBruteLoss(rand(5,10))

else
flippy_mcgee.visible_message(
span_notice("[flippy_mcgee] пытается удержать баланс после прыжка.") ,
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/carbon_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@
"You hear a slap.")
target.dna?.species?.stop_wagging_tail(target)
return

do_attack_animation(target, ATTACK_EFFECT_DISARM)
playsound(target, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
if (ishuman(target))
Expand Down
6 changes: 2 additions & 4 deletions code/modules/mob/living/carbon/human/life.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,13 @@
//heart attack stuff
handle_heart(delta_time, times_fired)
handle_liver(delta_time, times_fired)
if(dancing_period)
dancing_period--
if(prob(2))
if(nutrition < NUTRITION_LEVEL_STARVING)
to_chat(src, span_warning("[pick("Голодно...", "Кушать хочу...", "Вот бы что-нибудь съесть...", "Мой живот урчит...")]"))
take_overall_damage(stamina = 60)
take_overall_damage(stamina = 40)
if(hydration <= HYDRATION_LEVEL_DEHYDRATED)
to_chat(src, span_warning("[pick("Пить хочется...", "В горле пересохло...", "Водички бы сейчас...")]"))
take_overall_damage(stamina = 60)
take_overall_damage(stamina = 40)

dna.species.spec_life(src, delta_time, times_fired) // for mutantraces
else
Expand Down
16 changes: 0 additions & 16 deletions code/modules/reagents/chemistry/reagents/food_reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -137,22 +137,6 @@
nutriment_factor = 9 * REAGENTS_METABOLISM //45% as calorie dense as corn oil.
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED

/datum/reagent/consumable/nutriment/protein/semen
name = "Сперма"
description = "Натуральный биопродукт."
brute_heal = 0.3
nutriment_factor = 18 * REAGENTS_METABOLISM

/datum/reagent/consumable/nutriment/protein/semen/expose_turf(turf/exposed_turf, reac_volume)
. = ..()
if(isspaceturf(exposed_turf))
return

var/obj/effect/decal/cleanable/cum/reagentdecal = new(exposed_turf)
reagentdecal = locate() in exposed_turf
if(reagentdecal)
reagentdecal.reagents.add_reagent(/datum/reagent/consumable/nutriment/protein/semen, reac_volume)

/datum/reagent/consumable/nutriment/organ_tissue
name = "Органная Ткань"
description = "Natural tissues that make up the bulk of organs, providing many vitamins and minerals."
Expand Down
5 changes: 0 additions & 5 deletions code/modules/reagents/reagent_containers/bottle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -314,11 +314,6 @@
desc = "Маленький флакон, содержащий ПротивоБиоВирусный Набор."
list_reagents = list(/datum/reagent/vaccine/fungal_tb = 30)

/obj/item/reagent_containers/glass/bottle/cumvirus
name = "Флакон с Cumthiris+61"
desc = "Маленький флакон, содержащий Cumthiris+61."
spawned_disease = /datum/disease/cumvirus

//Oldstation.dmm chemical storage bottles

/obj/item/reagent_containers/glass/bottle/hydrogen
Expand Down
8 changes: 0 additions & 8 deletions code/modules/uplink/uplink_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1747,14 +1747,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
surplus = 0

/datum/uplink_item/role_restricted/cumvirus_kit
name = "Cumthiris Virus"
desc = "Экспериментальное биооружие, призванное выводить из строя членов экипажа. Симптомы включают в себя: возбуждение, непризвольная эякуляция, эйфория, половое влечение к людям и полную потерю рассудка. Тем не менее, легко лечится с помощью галоперидола и святой воды."
item = /obj/item/storage/box/syndie_kit/cumvirus
cost = 30
cant_discount = TRUE
restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Virologist")

/datum/uplink_item/role_restricted/ancient_jumpsuit
name = "Ancient Jumpsuit"
desc = "A tattered old jumpsuit that will provide absolutely no benefit to you."
Expand Down
12 changes: 0 additions & 12 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3905,7 +3905,6 @@
#include "white\baldenysh\govnokod\antags\mutant_zombies\zombie_antag.dm"
#include "white\baldenysh\govnokod\antags\mutant_zombies\zombie_items.dm"
#include "white\baldenysh\govnokod\antags\mutant_zombies\zombie_species.dm"
#include "white\baldenysh\govnokod\atmospherics\atmos_machines_recipes.dm"
#include "white\baldenysh\govnokod\atmospherics\gasmixtures\gas_recipe_reactions.dm"
#include "white\baldenysh\govnokod\chem\reactions.dm"
#include "white\baldenysh\govnokod\chem\reagents.dm"
Expand Down Expand Up @@ -4130,7 +4129,6 @@
#include "white\rebolution228\copypasta\clothing\masks.dm"
#include "white\rebolution228\copypasta\clothing\suits.dm"
#include "white\rebolution228\copypasta\clothing\uniform.dm"
#include "white\rebolution228\copypasta\diseases\cumvirus.dm"
#include "white\rebolution228\copypasta\objects\miscellaneous.dm"
#include "white\rebolution228\copypasta\objects\toys.dm"
#include "white\rebolution228\copypasta\weapons\attachments.dm"
Expand All @@ -4153,7 +4151,6 @@
#include "white\shruman\code\clowns\clownstructures.dm"
#include "white\valtos\protocol_C.dm"
#include "white\valtos\code\__DEFINES\bloodsucker.dm"
#include "white\valtos\code\__DEFINES\dance.dm"
#include "white\valtos\code\__DEFINES\dwarf.dm"
#include "white\valtos\code\__DEFINES\hud.dm"
#include "white\valtos\code\__DEFINES\mobs.dm"
Expand Down Expand Up @@ -4292,14 +4289,6 @@
#include "white\valtos\code\exploration\super_cruise\orbital_poi_generator\ruin_generator\ruin_events\asteriod_station.dm"
#include "white\valtos\code\exploration\super_cruise\shuttle_components\shuttle_console.dm"
#include "white\valtos\code\exploration\super_cruise\shuttle_components\shuttle_docking.dm"
#include "white\valtos\code\exrp\_dance.dm"
#include "white\valtos\code\exrp\_interaction.dm"
#include "white\valtos\code\exrp\dance_code.dm"
#include "white\valtos\code\exrp\dance_definitions.dm"
#include "white\valtos\code\exrp\dance_mob.dm"
#include "white\valtos\code\exrp\interaction_interface.dm"
#include "white\valtos\code\exrp\interaction_whitelist.dm"
#include "white\valtos\code\exrp\smetanka.dm"
#include "white\valtos\code\fallout_guns\ammo.dm"
#include "white\valtos\code\fallout_guns\ballistic.dm"
#include "white\valtos\code\fallout_guns\projectiles.dm"
Expand Down Expand Up @@ -4477,7 +4466,6 @@
#include "white\valtos\code\unsorted\port_grav.dm"
#include "white\valtos\code\unsorted\prison.dm"
#include "white\valtos\code\unsorted\randommaint.dm"
#include "white\valtos\code\unsorted\raper.dm"
#include "white\valtos\code\unsorted\rusprikols.dm"
#include "white\valtos\code\unsorted\scavenger.dm"
#include "white\valtos\code\unsorted\scp.dm"
Expand Down
15 changes: 0 additions & 15 deletions white/baldenysh/govnokod/atmospherics/atmos_machines_recipes.dm

This file was deleted.

61 changes: 38 additions & 23 deletions white/qwaszx000/winners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,11 @@
layer = ABOVE_MOB_LAYER
anchored = TRUE
flags_1 = NODECONSTRUCT_1
var/list/coomers = list()
var/list/mob/living/carbon/human/enjoyers = list()

/obj/structure/statue/gold/robust/attack_hand(mob/user)
/obj/structure/statue/gold/robust/Initialize()
. = ..()
if(!(user.name in coomers))
if(isliving(user))
inc_metabalance(user, 1, TRUE)
visible_message(span_noticeital("[user] кланяется статуе!"))
coomers += user.name

/obj/structure/statue/gold/robust/examine_more(mob/user)
if(coomers)
return "<hr><b>Уважение проявили:</b> <i>[english_list(coomers)]</i>."
AddComponent(/datum/component/respect)

/obj/structure/sign/plaques/robust
name = "Портрет: Maye Frey"
Expand All @@ -124,24 +116,47 @@
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
custom_materials = list(/datum/material/silver=MINERAL_MATERIAL_AMOUNT*2)
flags_1 = NODECONSTRUCT_1
var/list/coomers = list()

/obj/structure/sign/plaques/robust/examine_more(mob/user)
. = ..()
if(coomers)
. += "<hr><b>Уважение проявили:</b> <i>[english_list(coomers)]</i>."
var/list/mob/living/carbon/human/enjoyers = list()

/obj/structure/sign/plaques/robust/attack_hand(mob/user)
/obj/structure/sign/plaques/robust/Initialize()
. = ..()
if(!(user.name in coomers))
if(ishuman(user))
var/mob/living/carbon/human/H = user
H.end_dance(null, null)
coomers += user.name
AddComponent(/datum/component/respect)

/obj/structure/sign/plaques/robust/bronze
name = "Портрет: Ash Williams"
desc = "Лошара, третье место.<hr><b>Rev1n</b> - третье место!"
icon_state = "bronze_2022"
custom_materials = list(/datum/material/bronze=MINERAL_MATERIAL_AMOUNT*2)
flags_1 = NODECONSTRUCT_1

/datum/component/respect
dupe_mode = COMPONENT_DUPE_UNIQUE
var/list/enjoyers = list()

/datum/component/respect/RegisterWithParent()
. = ..()
RegisterSignal(parent, COMSIG_PARENT_EXAMINE_MORE, .proc/list_enjoyers)
RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/reward)

/datum/component/respect/UnregisterFromParent()
. = ..()
UnregisterSignal(parent, COMSIG_PARENT_EXAMINE_MORE)
UnregisterSignal(parent, COMSIG_ATOM_ATTACK_HAND)

/datum/component/respect/proc/reward(mob/user)
SIGNAL_HANDLER

if(!(user in enjoyers))
enjoyers += user
to_chat(user, span_notice("Отдаю дань уважения."))
if(ishuman(user))
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "high_five", /datum/mood_event/respect)

/datum/component/respect/proc/list_enjoyers(list)
. = list
if(enjoyers)
. += "<hr><b>Уважение проявили:</b> <i>[english_list(enjoyers)]</i>."
/datum/mood_event/respect
description = "Горжусь своим народом!"
mood_change = 8
timeout = 1 MINUTES
69 changes: 0 additions & 69 deletions white/rebolution228/copypasta/diseases/cumvirus.dm

This file was deleted.

13 changes: 0 additions & 13 deletions white/valtos/code/__DEFINES/dance.dm

This file was deleted.

10 changes: 0 additions & 10 deletions white/valtos/code/exrp/_dance.dm

This file was deleted.

Loading

0 comments on commit 5c1495b

Please sign in to comment.