mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-12 00:20:55 +01:00
a
This commit is contained in:
Pinta
Vendored
+10
-1
@@ -1,12 +1,21 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
|
||||
{
|
||||
"type": "byond",
|
||||
"request": "launch",
|
||||
"name": "Launch DreamSeeker",
|
||||
"preLaunchTask": "dm: build - ${command:CurrentDME}",
|
||||
"dmb": "${workspaceFolder}/${command:CurrentDMB}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "byond",
|
||||
"request": "launch",
|
||||
"name": "Launch DreamDaemon",
|
||||
"preLaunchTask": "dm: build - ${command:CurrentDME}",
|
||||
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
|
||||
"dreamDaemon": true
|
||||
},
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
/obj/code/game/mobs/unusualtentical
|
||||
name = "unusualtentical"
|
||||
desc = "Whats this doing here?"
|
||||
|
||||
@@ -1,60 +1,58 @@
|
||||
|
||||
/datum/emote/living/gurgle
|
||||
key = "gurgle"
|
||||
key_third_person = "gurgles"
|
||||
message = "'s belly gurgles"
|
||||
emote_type = EMOTE_AUDIBLE
|
||||
|
||||
|
||||
/datum/emote/living/gurgle/run_emote(mob/living/user, params)
|
||||
if(ishuman(user))
|
||||
if(prob(50))
|
||||
playsound(user, 'GainStation13/sound/voice/gurgle1.ogg', 50, 1, -1)
|
||||
else
|
||||
playsound(user, 'GainStation13/sound/voice/gurgle2.ogg', 50, 1, -1)
|
||||
if(!ishuman(user))
|
||||
return FALSE
|
||||
|
||||
if(prob(50))
|
||||
playsound(user, 'GainStation13/sound/voice/gurgle1.ogg', 50, 1, -1)
|
||||
else
|
||||
playsound(user, 'GainStation13/sound/voice/gurgle2.ogg', 50, 1, -1)
|
||||
|
||||
. = ..()
|
||||
|
||||
/datum/emote/living/burp/run_emote(mob/living/user, params)
|
||||
if(ishuman(user))
|
||||
playsound(user, 'GainStation13/sound/voice/burp1.ogg', 50, 1, -1)
|
||||
if(!ishuman(user))
|
||||
return FALSE
|
||||
|
||||
playsound(user, 'GainStation13/sound/voice/burp1.ogg', 50, 1, -1)
|
||||
. = ..()
|
||||
|
||||
/datum/emote/living/fart
|
||||
key = "fart"
|
||||
key_third_person = "farts"
|
||||
message = " farts"
|
||||
message = "farts"
|
||||
emote_type = EMOTE_AUDIBLE
|
||||
|
||||
|
||||
//god hates me for this -Metha
|
||||
|
||||
/datum/emote/living/fart/run_emote(mob/living/user, params)
|
||||
if(ishuman(user))
|
||||
|
||||
var/fartSoundChoice = rand(3)
|
||||
|
||||
switch(fartSoundChoice)
|
||||
if (0) playsound(user, 'GainStation13/sound/voice/fart3.ogg', 50, 1, -1)
|
||||
|
||||
if (1) playsound(user, 'GainStation13/sound/voice/fart4.ogg', 50, 1, -1)
|
||||
|
||||
if (2) playsound(user, 'GainStation13/sound/voice/fart2.ogg', 50, 1, -1)
|
||||
|
||||
if (3) playsound(user, 'GainStation13/sound/voice/fart1.ogg', 50, 1, -1)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
. = ..()
|
||||
|
||||
if(!ishuman(user))
|
||||
return FALSE
|
||||
|
||||
var/fartSoundChoice = rand(3)
|
||||
switch(fartSoundChoice)
|
||||
if (0)
|
||||
playsound(user, 'GainStation13/sound/voice/fart3.ogg', 50, 1, -1)
|
||||
if (1)
|
||||
playsound(user, 'GainStation13/sound/voice/fart4.ogg', 50, 1, -1)
|
||||
if (2)
|
||||
playsound(user, 'GainStation13/sound/voice/fart2.ogg', 50, 1, -1)
|
||||
if (3)
|
||||
playsound(user, 'GainStation13/sound/voice/fart1.ogg', 50, 1, -1)
|
||||
|
||||
. = ..()
|
||||
|
||||
//Shhh... It's a secret! Don't tell or I'll steal your legs
|
||||
/datum/emote/living/burunyu
|
||||
key = "burunyu"
|
||||
key_third_person = "burunyues"
|
||||
message = " emits a strange feline sound"
|
||||
message = "emits a strange feline sound"
|
||||
emote_type = EMOTE_AUDIBLE
|
||||
|
||||
/datum/emote/living/burunyu/run_emote(mob/living/user, params)
|
||||
@@ -65,29 +63,28 @@
|
||||
/datum/emote/living/belch
|
||||
key = "belch"
|
||||
key_third_person = "belches loudly"
|
||||
message = " belches"
|
||||
message = "belches"
|
||||
emote_type = EMOTE_AUDIBLE
|
||||
|
||||
|
||||
//god hates me for this -Metha
|
||||
|
||||
/datum/emote/living/belch/run_emote(mob/living/user, params)
|
||||
if(ishuman(user))
|
||||
if(!ishuman(user))
|
||||
return FALSE
|
||||
|
||||
var/fartSoundChoice = rand(5)
|
||||
switch(fartSoundChoice)
|
||||
if(0)
|
||||
playsound(user, 'GainStation13/sound/voice/belch3.ogg', 50, 1, -1)
|
||||
if(1)
|
||||
playsound(user, 'GainStation13/sound/voice/belch4.ogg', 50, 1, -1)
|
||||
if(2)
|
||||
playsound(user, 'GainStation13/sound/voice/belch2.ogg', 50, 1, -1)
|
||||
if(3)
|
||||
playsound(user, 'GainStation13/sound/voice/belch1.ogg', 50, 1, -1)
|
||||
if(4)
|
||||
playsound(user, 'GainStation13/sound/voice/belch5.ogg', 50, 1, -1)
|
||||
if(5)
|
||||
playsound(user, 'GainStation13/sound/voice/belch6.ogg', 50, 1, -1)
|
||||
|
||||
var/fartSoundChoice = rand(5)
|
||||
|
||||
switch(fartSoundChoice)
|
||||
if (0) playsound(user, 'GainStation13/sound/voice/belch3.ogg', 50, 1, -1)
|
||||
|
||||
if (1) playsound(user, 'GainStation13/sound/voice/belch4.ogg', 50, 1, -1)
|
||||
|
||||
if (2) playsound(user, 'GainStation13/sound/voice/belch2.ogg', 50, 1, -1)
|
||||
|
||||
if (3) playsound(user, 'GainStation13/sound/voice/belch1.ogg', 50, 1, -1)
|
||||
|
||||
if (4) playsound(user, 'GainStation13/sound/voice/belch5.ogg', 50, 1, -1)
|
||||
|
||||
if (5) playsound(user, 'GainStation13/sound/voice/belch6.ogg', 50, 1, -1)
|
||||
|
||||
|
||||
. = ..()
|
||||
. = ..()
|
||||
|
||||
@@ -12,4 +12,5 @@
|
||||
/datum/reagent/consumable/lipoifier/on_mob_life(mob/living/carbon/M)
|
||||
if(M && !HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
|
||||
M.fatness = M.fatness + 10
|
||||
return ..()
|
||||
|
||||
return ..()
|
||||
|
||||
@@ -23,10 +23,6 @@
|
||||
|
||||
refill_canister = /obj/item/vending_refill/mealdor
|
||||
|
||||
obj/item/vending_refill/mealdor
|
||||
/obj/item/vending_refill/mealdor
|
||||
machine_name = "Meal Vendor Refill"
|
||||
icon_state = "refill_mealdor"
|
||||
|
||||
#define STANDARD_CHARGE 1
|
||||
#define CONTRABAND_CHARGE 2
|
||||
#define COIN_CHARGE 3
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
/obj/item/reagent_containers/food/snacks/cookie = 10,
|
||||
/obj/item/reagent_containers/food/snacks/salad/fruit = 15,
|
||||
/obj/item/reagent_containers/food/snacks/salad = 20,
|
||||
/obj/item/reagent_containers/food/snacks/salad/hellcobb =10,
|
||||
/obj/item/reagent_containers/food/snacks/salad/hellcobb = 10,
|
||||
/obj/item/clothing/under/cowkini = 5,
|
||||
)
|
||||
premium = list(
|
||||
@@ -48,11 +48,3 @@
|
||||
)
|
||||
|
||||
refill_canister = /obj/item/vending_refill/mealdor
|
||||
|
||||
obj/item/vending_refill/mealdor
|
||||
machine_name = "Meal Vendor Refill"
|
||||
icon_state = "refill_mealdor"
|
||||
|
||||
#define STANDARD_CHARGE 1
|
||||
#define CONTRABAND_CHARGE 2
|
||||
#define COIN_CHARGE 3
|
||||
|
||||
@@ -662,7 +662,7 @@ This is here to make the tiles around the station mininuke change when it's arme
|
||||
var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
|
||||
if(istype(loneop))
|
||||
loneop.weight += 1
|
||||
if(loneop.weight % 5 == 0)
|
||||
// if(loneop.weight % 5 == 0)
|
||||
// message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].") // Commenting this out because it's a fucking pain for the admins - Sono
|
||||
log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].")
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user