Bleeding edgy refresh (#303)

* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
+1 -1
View File
@@ -50,7 +50,7 @@ var/global/list/uplinks = list()
if(I.type == path && refundable && I.check_uplink_validity())
telecrystals += cost
spent_telecrystals -= cost
user << "<span class='notice'>[I] refunded.</span>"
to_chat(user, "<span class='notice'>[I] refunded.</span>")
qdel(I)
return
..()
+23 -6
View File
@@ -112,9 +112,9 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
if(ishuman(user) && istype(A, /obj/item))
var/mob/living/carbon/human/H = user
if(H.put_in_hands(A))
H << "[A] materializes into your hands!"
to_chat(H, "[A] materializes into your hands!")
else
H << "\The [A] materializes onto the floor."
to_chat(H, "\The [A] materializes onto the floor.")
return 1
//Discounts (dynamically filled above)
@@ -590,9 +590,10 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
name = "CQC Manual"
desc = "A manual that teaches a single user tactical Close-Quarters Combat before self-destructing."
item = /obj/item/weapon/cqc_manual
include_modes = list(/datum/game_mode/nuclear)
cost = 13
surplus = 1
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/traitor)
surplus = 0
/datum/uplink_item/stealthy_weapons/throwingweapons
name = "Box of Throwing Weapons"
desc = "A box of shurikens and reinforced bolas from ancient Earth martial arts. They are highly effective \
@@ -1079,6 +1080,12 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
item = /obj/item/stack/telecrystal/twenty
cost = 20
/datum/uplink_item/device_tools/jammer
name = "Radio jammer"
desc = "This device will disrupt any nearby outgoing radio communication when activated."
item = /obj/item/device/jammer
cost = 10
// Implants
/datum/uplink_item/implants
category = "Implants"
@@ -1193,9 +1200,10 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
/datum/uplink_item/role_restricted/mimery
name = "Guide to Advanced Mimery Series"
desc = "The classical two part series on how to further hone your mime skills. Upon studying the series, the user should be able to make 3x1 invisble walls, and shoot bullets out of their fingers. Obviously only works for Mimes."
cost = 15
cost = 12
item = /obj/item/weapon/storage/box/syndie_kit/mimery
restricted_roles = list("Mime")
surplus = 0
/datum/uplink_item/role_restricted/ez_clean_bundle
name = "EZ Clean Grenade Bundle"
@@ -1215,13 +1223,22 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
cost = 20
restricted_roles = list("Chaplain")
surplus = 5 //Very low chance to get it in a surplus crate even without being the chaplain
/datum/uplink_item/role_restricted/ancient_jumpsuit
name = "Ancient Jumpsuit"
desc = "A tattered old jumpsuit that will provide absolutely no benefit to you. It fills the wearer with a strange compulsion to blurt out 'glorf'."
item = /obj/item/clothing/under/color/grey/glorf
cost = 20
surplus = 0
restricted_roles = list("Assistant")
surplus = 0
/datum/uplink_item/role_restricted/haunted_magic_eightball
name = "Haunted Magic Eightball"
desc = "Most magic eightballs are toys with dice inside. Although identical in appearance to the harmless toys, this occult device reaches into the spirit world to find its answers. Be warned, that spirits are often capricious or just little assholes. To use, simply speak your question aloud, then begin shaking."
item = /obj/item/toy/eightball/haunted
cost = 2
restricted_roles = list("Librarian")
limited_stock = 1 // please don't spam deadchat
// Pointless
/datum/uplink_item/badass