paprikkas gay

This commit is contained in:
paprka
2014-07-10 20:12:24 -07:00
parent d50547f97f
commit b92397a2e3
10 changed files with 25 additions and 20 deletions
+5
View File
@@ -70,6 +70,11 @@
HELMET_TYPE = /obj/item/clothing/head/helmet/space/rig/mining
MASK_TYPE = /obj/item/clothing/mask/breath
/obj/machinery/suit_storage_unit/cmo
SUIT_TYPE = /obj/item/clothing/suit/space/rig/medical
HELMET_TYPE = /obj/item/clothing/head/helmet/space/rig/medical
MASK_TYPE = /obj/item/clothing/mask/breath
/obj/machinery/suit_storage_unit/New()
src.update_icon()
if(SUIT_TYPE)
@@ -115,7 +115,7 @@
item_state = "seclite"
force = 9 // Not as good as a stun baton.
brightness_on = 5 // A little better than the standard flashlight.
hitsound = 'swing_hit'
// the desk lamps are a bit special
/obj/item/device/flashlight/lamp
+1 -1
View File
@@ -133,7 +133,7 @@
/obj/item/clothing/glasses/thermal/syndi //These are now a traitor item, concealed as mesons. -Pete
name = "Optical Meson Scanner"
desc = "Used for seeing walls, floors, and stuff through anything."
desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
icon_state = "meson"
origin_tech = "magnets=3;syndicate=4"
+6 -6
View File
@@ -360,29 +360,29 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/chaos
/datum/recipe/human/kabob
/datum/recipe/human/kebab
items = list(
/obj/item/stack/rods,
/obj/item/weapon/reagent_containers/food/snacks/meat/human,
/obj/item/weapon/reagent_containers/food/snacks/meat/human,
)
result = /obj/item/weapon/reagent_containers/food/snacks/human/kabob
result = /obj/item/weapon/reagent_containers/food/snacks/human/kebab
/datum/recipe/monkeykabob
/datum/recipe/monkeykebab
items = list(
/obj/item/stack/rods,
/obj/item/weapon/reagent_containers/food/snacks/meat/monkey,
/obj/item/weapon/reagent_containers/food/snacks/meat/monkey,
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob
result = /obj/item/weapon/reagent_containers/food/snacks/monkeykebab
/datum/recipe/tofukabob
/datum/recipe/tofukebab
items = list(
/obj/item/stack/rods,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
)
result = /obj/item/weapon/reagent_containers/food/snacks/tofukabob
result = /obj/item/weapon/reagent_containers/food/snacks/tofukebab
/datum/recipe/tofubread
reagents = list("flour" = 15)
+2 -2
View File
@@ -53,7 +53,7 @@
/obj/item/weapon/gun/energy/crossbow
name = "mini energy-crossbow"
name = "mini energy crossbow"
desc = "A weapon favored by many of the syndicates stealth specialists."
icon_state = "crossbow"
w_class = 2.0
@@ -99,7 +99,7 @@
return
/obj/item/weapon/gun/energy/crossbow/largecrossbow
name = "Energy Crossbow"
name = "energy crossbow"
desc = "A weapon favored by syndicate infiltration teams."
w_class = 4.0
force = 10
+1 -1
View File
@@ -568,7 +568,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
spawn(waittime)
src.wait = null
update_icon()
playsound(src.loc, 'sound/items/timer.ogg', 30, 1)
playsound(src.loc, 'sound/machines/ping.ogg', 30, 1)
/obj/machinery/computer/pandemic/update_icon()
if(stat & BROKEN)
@@ -898,9 +898,9 @@
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/human/kabob
name = "-kabob"
icon_state = "kabob"
/obj/item/weapon/reagent_containers/food/snacks/human/kebab
name = "-kebab"
icon_state = "kebab"
desc = "A human meat, on a stick."
trash = /obj/item/stack/rods
New()
@@ -908,9 +908,9 @@
reagents.add_reagent("nutriment", 8)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/monkeykabob
name = "meat-kabob"
icon_state = "kabob"
/obj/item/weapon/reagent_containers/food/snacks/monkeykebab
name = "meat-kebab"
icon_state = "kebab"
desc = "Delicious meat, on a stick."
trash = /obj/item/stack/rods
New()
@@ -918,9 +918,9 @@
reagents.add_reagent("nutriment", 8)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tofukabob
name = "tofu-kabob"
icon_state = "kabob"
/obj/item/weapon/reagent_containers/food/snacks/tofukebab
name = "tofu-kebab"
icon_state = "kebab"
desc = "Vegan meat, on a stick."
trash = /obj/item/stack/rods
New()
Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 KiB

After

Width:  |  Height:  |  Size: 158 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 159 KiB

After

Width:  |  Height:  |  Size: 159 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 87 KiB

After

Width:  |  Height:  |  Size: 87 KiB