Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616

2020-03-21 21:41:34 +01:00
parent 4c87f2256c cb537f431b
commit 2045fb86f6
305 changed files with 160783 additions and 6683 deletions
@@ -40,7 +40,7 @@
 	name = "Fire Breath"
 	desc = "You can breathe fire at a target."
 	school = "evocation"
-	charge_max = 1200
+	charge_max = 600
 	clothes_req = NONE
 	range = 20
 	base_icon_state = "fireball"