12/21 modernizations from TG live (#103)

* sync (#3)

* shuttle auto call

* Merge /vore into /master (#39)

* progress

* Compile errors fixed

No idea if it's test worthy tho as conflicts with race overhaul and
narky removal.

* Update admins.txt

* efforts continue

Fuck grab code, seriously

* grab code is cancer

* Execute the Narkism

Do not hesitate.

Show no mercy.

* holy shit grab code is awful

* have I bitched about grab code

My bitching, let me show you it

* código de agarre es una mierda

No really it is

* yeah I don't even know anymore.

* Lolnope. Fuck grab code

* I'm not even sure what to fix anymore

* Self eating is not an acceptable fate

* Taste the void, son.

* My code doesn't pass it's own sanity check.

Maybe it's a sign of things to come.

* uncommented and notes

* It Works and I Don't Know Why (#38)

* shuttle auto call

* it works and I don't know why

* Subsystem 12/21

Most Recent TG subsystem folder

* globalvars 12/21

Tossed out the flavor_misc and parallax files

* Onclick 12/21

as well as .dme updates

* _defines 12/21

ommited old _MC.dm

* _HELPERS 12/21

Preserved snowflake placement of furry sprites

* _defeines/genetics

reapplied narkism holdover for snowflake races.

* Oops forgot mutant colors

* modules porting 12/21 + Sounds/icons

Admin, Client and most of mob life files ommitted

* enviroment file

* Admin optimizations

ahelp log system kept

* Mob ports 12/21

Flavor text preserved

* datums ported 12/21

* Game ported 12/21

* batch of duplicate fixes/dogborg work

Dogborgs need to be modernized to refractored borg standards.

* moar fixes

* Maps and futher compile fixes
This commit is contained in:
Poojawa
2016-12-22 03:57:55 -06:00
committed by GitHub
parent f5e143a452
commit cf59ac1c3d
2215 changed files with 707445 additions and 87041 deletions
+15 -14
View File
@@ -9,9 +9,9 @@
/obj/item/weapon/deck
name = "deck of cards"
desc = "A simple deck of playing cards."
icon = 'playing_cards.dmi'
icon = 'icons/obj/playing_cards.dmi'
icon_state = "deck"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
flags = NOBLUDGEON
var/list/cards = list()
@@ -19,17 +19,19 @@
/obj/item/weapon/deck/New()
. = ..()
var/color
var/cardcolor
var/datum/playingcard/card
for (var/suit in list("spades", "clubs", "diamonds", "hearts"))
if (suit == "spades" || suit == "clubs") color = "black_"
else color = "red_"
if (suit == "spades" || suit == "clubs")
cardcolor = "black_"
else
cardcolor = "red_"
for (var/number in list("ace", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten"))
card = new()
card.name = "[number] of [suit]"
card.card_icon = "[color]num"
card.card_icon = "[cardcolor]num"
card.suit = suit
card.number = number
@@ -38,7 +40,7 @@
for (var/number in list("jack", "queen", "king"))
card = new()
card.name = "[number] of [suit]"
card.card_icon = "[color]col"
card.card_icon = "[cardcolor]col"
card.suit = suit
card.number = number
@@ -81,7 +83,7 @@
if(flag)
return //It's adjacent, is the user, or is on the user's person
if (istype(A, /mob/living))
if(isliving(A))
src.dealTo(A, user)
else
return ..()
@@ -117,15 +119,15 @@
/obj/item/weapon/hand
name = "hand of cards"
desc = "Some playing cards."
icon = 'playing_cards.dmi'
icon = 'icons/obj/playing_cards.dmi'
icon_state = "empty"
w_class = 1
w_class = WEIGHT_CLASS_TINY
var/concealed = 0
var/blank = 0
var/list/cards = list()
var/datum/html_interface/hi
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
/obj/item/weapon/hand/New(loc)
. = ..()
@@ -264,9 +266,8 @@
if (istype(hclient))
switch (href_list["action"])
if ("play_card")
var/datum/playingcard/card = locate(href_list["card"])
if (card in src.cards)
var/datum/playingcard/card = locate(href_list["card"]) in cards
if (card && istype(card))
src.discard(card)
if ("toggle_conceal")
src.toggle_conceal()
+2 -1
View File
@@ -29,6 +29,7 @@ var/global/list/cards_against_space
card_text_file = "strings/cas_black.txt"
/obj/item/toy/cards/deck/cas/New()
..()
if(!cards_against_space) //saves loading from the files every single time a new deck is created, but still lets each deck have a random assortment, it's purely an optimisation
cards_against_space = list("cas_white" = file2list("strings/cas_white.txt"),"cas_black" = file2list("strings/cas_black.txt"))
allcards = cards_against_space[card_face]
@@ -125,7 +126,7 @@ var/global/list/cards_against_space
flipped = !flipped
update_icon()
obj/item/toy/cards/singlecard/cas/AltClick(mob/living/user)
/obj/item/toy/cards/singlecard/cas/AltClick(mob/living/user)
if(!user.canUseTopic(src,1))
return
Flip()