cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 02:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

More name updates and refactoring for research

Browse Source 
Also fixes compile errors
This commit is contained in:
Amunak
2014-12-18 03:21:15 +01:00
parent 064357495d
commit d20ccdb6b4
4 changed files with 630 additions and 849 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/trash.dm
+49 -49
View File
@@ -2,71 +2,71 @@
//TODO: Make this an item var or something...
//Added by Jack Rost
obj/item/trash
icon = 'iconsobj/trash.dmi'
/obj/item/trash
icon = 'icons/obj/trash.dmi'
w_class = 2.0
desc = "This is rubbish."
obj/item/trash/raisins
name = "\improper 4no raisins"
icon_state= "4no_raisins"
/obj/item/trash/raisins
name = "\improper 4no raisins"
icon_state= "4no_raisins"
obj/item/trash/candy
name = "candy"
icon_state= "candy"
/obj/item/trash/candy
name = "candy"
icon_state= "candy"
obj/item/trash/cheesie
name = "\improper Cheesie Honkers"
icon_state = "cheesie_honkers"
/obj/item/trash/cheesie
name = "\improper Cheesie Honkers"
icon_state = "cheesie_honkers"
obj/item/trash/chips
name = "chips"
icon_state = "chips"
/obj/item/trash/chips
name = "chips"
icon_state = "chips"
obj/item/trash/popcorn
name = "popcorn"
icon_state = "popcorn"
/obj/item/trash/popcorn
name = "popcorn"
icon_state = "popcorn"
obj/item/trash/sosjerky
name = "Scaredy's Private Reserve Beef Jerky"
icon_state = "sosjerky"
/obj/item/trash/sosjerky
name = "Scaredy's Private Reserve Beef Jerky"
icon_state = "sosjerky"
obj/item/trash/syndi_cakes
name = "syndi cakes"
icon_state = "syndi_cakes"
/obj/item/trash/syndi_cakes
name = "syndi cakes"
icon_state = "syndi_cakes"
obj/item/trash/waffles
name = "waffles"
icon_state = "waffles"
/obj/item/trash/waffles
name = "waffles"
icon_state = "waffles"
obj/item/trash/plate
name = "plate"
icon_state = "plate"
/obj/item/trash/plate
name = "plate"
icon_state = "plate"
obj/item/trash/snack_bowl
name = "snack bowl"
icon_state = "snack_bowl"
/obj/item/trash/snack_bowl
name = "snack bowl"
icon_state = "snack_bowl"
obj/item/trash/pistachios
name = "pistachios pack"
icon_state = "pistachios_pack"
/obj/item/trash/pistachios
name = "pistachios pack"
icon_state = "pistachios_pack"
obj/item/trash/semki
name = "semki pack"
icon_state = "semki_pack"
/obj/item/trash/semki
name = "semki pack"
icon_state = "semki_pack"
obj/item/trash/tray
name = "tray"
icon_state = "tray"
/obj/item/trash/tray
name = "tray"
icon_state = "tray"
obj/item/trash/candle
name = "candle"
icon = 'iconsobj/candle.dmi'
icon_state = "candle4"
/obj/item/trash/candle
name = "candle"
icon = 'icons/obj/candle.dmi'
icon_state = "candle4"
obj/item/trash/liquidfood
name = "\improper \"LiquidFood\" ration"
icon_state = "liquidfood"
/obj/item/trash/liquidfood
name = "\improper \"LiquidFood\" ration"
icon_state = "liquidfood"
obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
/obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
return
code/game/objects/items/weapons/dna_injector.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/item/weapon/dnainjector
name = "\improperDNA injector"
name = "\improper DNA injector"
desc = "This injects the person with DNA."
icon = 'icons/obj/items.dmi'
icon_state = "dnainjector"