City of Light 3.0 Core (#1968)

* Update machines.dm

update to baton

Update meat.dm

City of Light update

Update machines.dm

Update machines.dm

asd

asd

Update skills.dm

Update carnival.dm

updates

skills update

skills update

Revert "Update skills.dm"

This reverts commit a205c66.

Update city.json

Update director.dm

asd

Update lobotomy-corp13.dme

skill updates

Revert "City of Light update"

This reverts commit cfa84ba.

updates stats

removes meat

asd

* Update vending.dm

* Update carnival.dm

Update backstreets_butcher.dm

add update to boyslove

* adds in hana quests

* Update dungeon_backstreets.dmm

* adds 8 new skills

* asd

ModularTegustation/tegu_items/associations/items.dm

@@ -69,13 +69,21 @@
 	to_chat(user, span_nicegreen("You suddenly feel different."))
 	//Guarantee one
 	user.adjust_all_attribute_levels(amount)
+	to_chat(user, "<span class='nicegreen'>You gain 1 potential!</span>")
 
 	//Adjust by an extra attribute under level 2
 	if(get_attribute_level(user, TEMPERANCE_ATTRIBUTE)<=40)
 		user.adjust_all_attribute_levels(amount)
+		to_chat(user, "<span class='nicegreen'>You gain 1 potential!</span>")
 
 	//And one more under level 3
 	if(get_attribute_level(user, TEMPERANCE_ATTRIBUTE)<=60)
 		user.adjust_all_attribute_levels(amount)
+		to_chat(user, "<span class='nicegreen'>You gain 1 potential!</span>")
+
+	//And one last one before L4
+	if(get_attribute_level(user, TEMPERANCE_ATTRIBUTE)<=80)
+		user.adjust_all_attribute_levels(amount)
+		to_chat(user, "<span class='nicegreen'>You gain 1 potential!</span>")
 
 	qdel(src)

ModularTegustation/tegu_items/associations/machines.dm

@@ -182,9 +182,12 @@
 		if (10 - grade >= 10)
 			to_chat(user, span_notice("Potential too low to give grade. Not recommended to issue fixer license."))
 			return
+		if (10 - grade <= 0)	//Once people saw Dong-Hwan, the -7 Grade fixer.
+			to_chat(user, "<span class='notice'>Recommended Grade - 1.</span>")
+			return
 
-		to_chat(user, span_notice("Recommended Grade - [10-grade]."))
-		to_chat(user, span_notice("This grade may be adjusted by your local Hana representative."))
+		to_chat(user, "<span class='notice'>Recommended Grade - [max(10-grade, 1)].</span>")
+		to_chat(user, "<span class='notice'>This grade may be adjusted by your local Hana representative.</span>")
 		return
 
 	to_chat(user, span_notice("No human potential identified."))
@@ -195,6 +198,7 @@
 /obj/structure/potential/attack_hand(mob/living/user)
 	calculate_grade(user)
 
+//Timelocks
 /obj/structure/timelock
 	name = "T-Corp locking mechanism"
 	desc = "A machine that is impossible to pass"
@@ -208,3 +212,24 @@
 
 /obj/structure/timelock/proc/die()
 	qdel(src)
+
+/obj/structure/moneymachine
+	name = "Hana funds machine"
+	desc = "A machine used by hana to create money."
+	icon = 'ModularTegustation/Teguicons/refiner.dmi'
+	icon_state = "moneymachine"
+	anchored = TRUE
+	density = FALSE
+	resistance_flags = INDESTRUCTIBLE
+	var/list/hanaroles = list("Hana Representative", "Hana Administrator")
+	var/inflation
+
+/obj/structure/moneymachine/attack_hand(mob/living/user)
+	if(!(user?.mind?.assigned_role in hanaroles))
+		to_chat(user, "<span class='notice'>The Machine flashes red. You cannot extract money from this machine</span>")
+		return
+	new /obj/item/stack/spacecash/c1000(get_turf(src))
+	inflation ++
+	if(inflation%50 == 0)
+		message_admins("<span class='notice'>Investigate the high volume of Ahn being printed by Hana Association. They have currently printed [inflation*1000] Ahn. \
+			Hana is supposed to print as needed, not bank up large sums of ahn.</span>")

ModularTegustation/tegu_items/associations/vending.dm

@@ -122,30 +122,36 @@
 
 	premium = list(
 		/obj/item/storage/firstaid/regular = 100,
-		/*
 		// Skills Below:
 		//Level 1
 		/obj/item/book/granter/action/skill/dash = 100,
 		/obj/item/book/granter/action/skill/dashback = 100,
 		/obj/item/book/granter/action/skill/assault = 100,
 		/obj/item/book/granter/action/skill/retreat = 100,
+		/obj/item/book/granter/action/skill/smokedash = 100,
 		/obj/item/book/granter/action/skill/healing = 100,
 		/obj/item/book/granter/action/skill/soothing = 100,
 		/obj/item/book/granter/action/skill/curing = 100,
 		/obj/item/book/granter/action/skill/hunkerdown = 100,
+		/obj/item/book/granter/action/skill/firstaid = 100,
+		/obj/item/book/granter/action/skill/meditation = 100,
 		//Level 2
 		/obj/item/book/granter/action/skill/shockwave = 100,
 		/obj/item/book/granter/action/skill/butcher = 100,
 		/obj/item/book/granter/action/skill/confusion = 100,
 		/obj/item/book/granter/action/skill/solarflare = 100,
+		/obj/item/book/granter/action/skill/lifesteal = 100,
+		/obj/item/book/granter/action/skill/lockpick = 100,
 		//Level 3
 		/obj/item/book/granter/action/skill/healthhud = 100,
 		/obj/item/book/granter/action/skill/bulletproof = 100,
 		/obj/item/book/granter/action/skill/battleready = 100,
 		//Level 4
 		/obj/item/book/granter/action/skill/timestop = 100,
 		/obj/item/book/granter/action/skill/reraise = 100,
-		*/
+		/obj/item/book/granter/action/skill/dismember = 100,
+		/obj/item/book/granter/action/skill/warbanner = 100,
+		/obj/item/book/granter/action/skill/warcry = 100,
 	)
 
 	default_price = 300

_maps/RandomRooms/backstreetlayout/dungeon_backstreets.dmm

@@ -441,7 +441,7 @@ E
 E
 L
 a
-a
+m
 a
 a
 a
@@ -27677,7 +27677,7 @@ a
 a
 a
 a
-a
+m
 a
 L
 E

_maps/city.json

@@ -1,6 +1,6 @@
 {
 	"version": 1,
-	"map_name": "Library of Ruina 13",
+	"map_name": "City Of Light",
 	"map_path": "map_files/Event",
 	"map_file": [
 		"city.dmm"