cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
ZomgPonies
2013-10-22 03:41:32 -04:00
parent 6a073828f5
commit 0d42f95633
25 changed files with 9194 additions and 9188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/shoes/miscellaneous.dm
+1 -1
View File
@@ -88,7 +88,7 @@
item_state = "jackboots"
_color = "hosred"
siemens_coefficient = 0.7
var/footstep=1
/obj/item/clothing/shoes/cult
name = "boots"
desc = "A pair of boots worn by the followers of Nar-Sie."
code/modules/food/recipes_microwave.dm
+16 -16
View File
@@ -2,7 +2,7 @@
// see code/datums/recipe.dm
/* No telebacon. just no...
/datum/recipe/telebacon
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat,
@@ -10,14 +10,14 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/telebacon
I said no!
/datum/recipe/syntitelebacon
items = list(
/obj/item/weapon/syntiflesh,
/obj/item/device/assembly/signaler
)
result = /obj/item/weapon/reagent_containers/food/snacks/telebacon
*/
/datum/recipe/friedegg
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
@@ -122,14 +122,14 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/brainburger
/* NO FUN ALLOWED
/datum/recipe/roburger
reagents = list("flour" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/robot_parts/head
)
result = /obj/item/weapon/reagent_containers/food/snacks/roburger
*/
/datum/recipe/xenoburger
reagents = list("flour" = 5)
@@ -192,7 +192,7 @@ I said no!
/datum/recipe/donkpocket
reagents = list("flour" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/faggot,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
)
result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
proc/warm_up(var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked)
@@ -592,7 +592,7 @@ I said no!
/datum/recipe/meatballsoup
reagents = list("water" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/faggot ,
/obj/item/weapon/reagent_containers/food/snacks/meatball ,
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
/obj/item/weapon/reagent_containers/food/snacks/grown/potato,
)
@@ -848,8 +848,8 @@ I said no!
reagents = list("water" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/spagetti,
/obj/item/weapon/reagent_containers/food/snacks/faggot,
/obj/item/weapon/reagent_containers/food/snacks/faggot,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
)
result = /obj/item/weapon/reagent_containers/food/snacks/meatballspagetti
@@ -857,10 +857,10 @@ I said no!
reagents = list("water" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/spagetti,
/obj/item/weapon/reagent_containers/food/snacks/faggot,
/obj/item/weapon/reagent_containers/food/snacks/faggot,
/obj/item/weapon/reagent_containers/food/snacks/faggot,
/obj/item/weapon/reagent_containers/food/snacks/faggot,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
)
result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw
@@ -1037,7 +1037,7 @@ I said no!
/datum/recipe/sausage
items = list(
/obj/item/weapon/reagent_containers/food/snacks/faggot,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meat,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sausage
@@ -1135,7 +1135,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
/obj/item/weapon/reagent_containers/food/snacks/grown/potato,
/obj/item/weapon/reagent_containers/food/snacks/faggot,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
)
result = /obj/item/weapon/reagent_containers/food/snacks/validsalad
make_food(var/obj/container as obj)
code/modules/mob/language.dm
+1 -1
View File
@@ -56,7 +56,7 @@
desc = "Languages of slimes, a mixture of bubbling noises and pops. Almost impossible to speak without mechanical aid for non slime people."
speech_verb = "bubbles and pops"
colour = "slime"
key = "sl"
key = "f"
flags = RESTRICTED
/datum/language/human
code/modules/mob/living/silicon/ai/ai.dm
+1 -1
View File
@@ -149,7 +149,7 @@ var/list/ai_list = list()
//if(icon_state == initial(icon_state))
var/icontype = ""
if (custom_sprite == 1) icontype = ("Custom")//automagically selects custom sprite if one is available
else icontype = input("Select an icon!", "AI", null, null) in list("Monochrome", "Blue", "Inverted", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss", "Firewall", "Green", "Red", "Static", "Triumvirate", "Triumvirate Static")
else icontype = input("Select an icon!", "AI", null, null) in list("Monochrome", "Blue", "Clown", "Inverted", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss", "Firewall", "Green", "Red", "Static", "Triumvirate", "Triumvirate Static")
switch(icontype)
if("Custom") icon_state = "[src.ckey]-ai"
if("Clown") icon_state = "ai-clown2"
code/modules/mob/new_player/sprite_accessories.dm
+1 -5
View File
@@ -51,7 +51,7 @@
name = "Bald"
icon_state = "bald"
gender = MALE
species_allowed = list("Human","Unathi")
species_allowed = list("Human","Unathi","Vox","Diona","Skellington","Kidan")
short
name = "Short Hair" // try to capatilize the names please~
@@ -288,10 +288,6 @@
icon_state = "hair_e"
gender = MALE // turnoff!
bald
name = "Bald"
icon_state = "bald"
/*
///////////////////////////////////
/ =---------------------------= /
code/modules/mob/say.dm
+2
View File
@@ -90,6 +90,8 @@
return 1
else if (istype(other, src.type) || istype(src, other.type))
return 1
else if (istype(other, /mob/living/carbon/human) && istype(src, /mob/living/carbon/human))
return 1
return 0
/mob/proc/say_quote(var/text,var/datum/language/speaking)
code/modules/power/apc.dm
+2 -1
View File
@@ -193,7 +193,7 @@
icon_state = "[ cell ? "apc2" : "apc1" ]" // if opened, show cell if it's inserted
if (overlays.len) overlays.len = 0 // also delete all overlays
return
else if(emagged)
else if(emagged || malfhack)
icon_state = "apcemag"
if (overlays.len) overlays.len = 0
return
@@ -957,6 +957,7 @@
else
src.malfai = usr
malfai << "Hack complete. The APC is now under your exclusive control."
src.malfhack = 1
update_icon()
else if (href_list["occupyapc"])
code/modules/reagents/reagent_containers/food/snacks.dm
+6 -6
View File
@@ -600,10 +600,10 @@
reagents.add_reagent("nutriment", 3)
src.bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/faggot
name = "Faggot"
desc = "A great meal all round. Not a cord of wood."
icon_state = "faggot"
/obj/item/weapon/reagent_containers/food/snacks/meatball
name = "Meatball"
desc = "A great meal all round."
icon_state = "meatball"
New()
..()
reagents.add_reagent("nutriment", 3)
@@ -1303,7 +1303,7 @@
reagents.add_reagent("tomatojuice", 2)
bitesize = 5
/* No more of this
/obj/item/weapon/reagent_containers/food/snacks/telebacon
name = "Tele Bacon"
desc = "It tastes a little odd but it is still delicious."
@@ -1318,7 +1318,7 @@
if(!reagents.total_volume)
baconbeacon.loc = usr
baconbeacon.digest_delay()
*/
/obj/item/weapon/reagent_containers/food/snacks/monkeycube
name = "monkey cube"