The Update (#241)

* auto vote runtime error fix

* part 1

* adds a wolf pai sprite

modified fox sprite that doesn't make your eyes bleed

* missed a painful sprite

* part 2

* ptwhatever

* save

* conflict resolution pt1

* conflict resolution pt2

* almost done with the preferences shit

* fixes missing arousal HUD

* file rename

* even more

* keep the panic commits coming

* forgot one

* wew, gonna go make some small changes

* s o o n

* LOOC admin and player toggles

* fixed backpacks and taurs clipping on the preview

* fixed penis length saving

* typo fix

* arousal fix

* icon tuning

* final
This commit is contained in:
TalkingCactus
2017-02-24 21:42:15 -05:00
committed by GitHub
parent 82fe4b01be
commit 36c580c236
49 changed files with 1608 additions and 540 deletions
-42
View File
@@ -1,42 +0,0 @@
/obj/structure/reagent_dispensers/keg
name = "keg"
desc = "A keg."
icon_state = "keg"
var/reagent_type = "water"
/obj/structure/reagent_dispensers/keg/New()
..()
reagents.add_reagent(reagent_type,1000)
/obj/structure/reagent_dispensers/keg/blob_act()
qdel(src)
/obj/structure/reagent_dispensers/keg/mead
name = "keg of mead"
desc = "A keg of mead."
icon_state = "orangekeg"
reagent_type = "mead"
/obj/structure/reagent_dispensers/keg/aphro
name = "keg of aphrodisiac"
desc = "A keg of aphrodisiac."
icon_state = "pinkkeg"
reagent_type = "hornychem"
/obj/structure/reagent_dispensers/keg/milk
name = "keg of milk"
desc = "It's not quite what you were hoping for."
icon_state = "whitekeg"
reagent_type = "milk"
/obj/structure/reagent_dispensers/keg/semen
name = "keg of semen"
desc = "Dear lord, where did this even come from?"
icon_state = "whitekeg"
reagent_type = "semen"
/obj/structure/reagent_dispensers/keg/gargle
name = "keg of pan galactic gargleblaster"
desc = "A keg of... wow that's a long name."
icon_state = "bluekeg"
reagent_type = "gargleblaster"