mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 11:07:12 +01:00
Updated:
Singularity Engine -Recoded some parts, still works mostly the same Welders -Recoded, it works mostly the same but is easier to use in code -Cyborgs have a larger fuel tank -Brought most if not all of the areas that use welders upto spec Moved the changeling chem recharge code into the human life proc New players who log out before spawning in are now deleted New minor Common event Machines around the station use more power, system might need some changes later Likely few other minor changes that I just cant think of atm git-svn-id: http://tgstation13.googlecode.com/svn/trunk@945 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -41,6 +41,9 @@
|
||||
//Disease Check
|
||||
handle_virus_updates()
|
||||
|
||||
//Changeling things
|
||||
handle_changeling()
|
||||
|
||||
//Handle temperature/pressure differences between body and environment
|
||||
handle_environment(environment)
|
||||
|
||||
@@ -720,7 +723,7 @@
|
||||
if(!seer)
|
||||
src.see_invisible = 0
|
||||
|
||||
if (istype(src.head, /obj/item/clothing/head/helmet/welding) && tinted_weldhelh)
|
||||
if (istype(src.head, /obj/item/clothing/head/helmet/welding) && tinted_weldhelh)
|
||||
src.see_in_dark = 0
|
||||
|
||||
if (src.sleep) src.sleep.icon_state = text("sleep[]", src.sleeping)
|
||||
@@ -866,6 +869,13 @@
|
||||
if(!M.nodamage)
|
||||
M.bruteloss += 5
|
||||
src.nutrition += 10
|
||||
|
||||
handle_changeling()
|
||||
if (mind)
|
||||
if (mind.special_role == "Changeling")
|
||||
src.chem_charges = between(0, (max((0.9 - (chem_charges / 50)), 0.1) + chem_charges), 50)
|
||||
|
||||
|
||||
/*
|
||||
// Commented out so hunger system won't be such shock
|
||||
// Damage and effects from not eating
|
||||
|
||||
@@ -40,6 +40,9 @@
|
||||
//Disease Check
|
||||
handle_virus_updates()
|
||||
|
||||
//Changeling things
|
||||
handle_changeling()
|
||||
|
||||
//Handle temperature/pressure differences between body and environment
|
||||
if(environment) // More error checking -- TLE
|
||||
handle_environment(environment)
|
||||
@@ -564,4 +567,9 @@
|
||||
src.drop_item()
|
||||
src.density = 1
|
||||
else
|
||||
src.density = !src.lying
|
||||
src.density = !src.lying
|
||||
|
||||
handle_changeling()
|
||||
if (mind)
|
||||
if (mind.special_role == "Changeling")
|
||||
src.chem_charges = between(0, (max((0.9 - (chem_charges / 50)), 0.1) + chem_charges), 50)
|
||||
@@ -351,9 +351,10 @@
|
||||
statpanel("Status")
|
||||
stat(null, text("Intent: []", src.a_intent))
|
||||
stat(null, text("Move Mode: []", src.m_intent))
|
||||
if (src.client.statpanel == "Status")
|
||||
if (src.mind.special_role == "Changeling")
|
||||
stat("Chemical Storage", src.chem_charges)
|
||||
if(client && mind)
|
||||
if (src.client.statpanel == "Status")
|
||||
if (src.mind.special_role == "Changeling")
|
||||
stat("Chemical Storage", src.chem_charges)
|
||||
return
|
||||
|
||||
/mob/living/carbon/monkey/update_clothing()
|
||||
|
||||
@@ -185,18 +185,16 @@
|
||||
|
||||
/mob/living/silicon/hivebot/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if (istype(W, /obj/item/weapon/weldingtool) && W:welding)
|
||||
if (W:get_fuel() > 2)
|
||||
W:use_fuel(1)
|
||||
if (W:remove_fuel(4))
|
||||
src.bruteloss -= 30
|
||||
if(src.bruteloss < 0) src.bruteloss = 0
|
||||
src.updatehealth()
|
||||
src.add_fingerprint(user)
|
||||
for(var/mob/O in viewers(user, null))
|
||||
O.show_message(text("\red [user] has fixed some of the dents on [src]!"), 1)
|
||||
else
|
||||
user << "Need more welding fuel!"
|
||||
return
|
||||
src.bruteloss -= 30
|
||||
if(src.bruteloss < 0) src.bruteloss = 0
|
||||
src.updatehealth()
|
||||
src.add_fingerprint(user)
|
||||
for(var/mob/O in viewers(user, null))
|
||||
O.show_message(text("\red [user] has fixed some of the dents on [src]!"), 1)
|
||||
|
||||
|
||||
/mob/living/silicon/hivebot/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
|
||||
|
||||
|
||||
@@ -281,6 +281,7 @@
|
||||
|
||||
process_locks()
|
||||
if(weapon_lock)
|
||||
src.module_active = null
|
||||
src.module_state_1 = null
|
||||
src.module_state_2 = null
|
||||
src.module_state_3 = null
|
||||
|
||||
@@ -348,17 +348,17 @@
|
||||
|
||||
/mob/living/silicon/robot/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if (istype(W, /obj/item/weapon/weldingtool) && W:welding)
|
||||
if (W:get_fuel() > 2)
|
||||
W:use_fuel(1)
|
||||
if (W:remove_fuel(4))
|
||||
src.bruteloss -= 30
|
||||
if(src.bruteloss < 0) src.bruteloss = 0
|
||||
src.updatehealth()
|
||||
src.add_fingerprint(user)
|
||||
for(var/mob/O in viewers(user, null))
|
||||
O.show_message(text("\red [user] has fixed some of the dents on [src]!"), 1)
|
||||
else
|
||||
user << "Need more welding fuel!"
|
||||
return
|
||||
src.bruteloss -= 30
|
||||
if(src.bruteloss < 0) src.bruteloss = 0
|
||||
src.updatehealth()
|
||||
src.add_fingerprint(user)
|
||||
for(var/mob/O in viewers(user, null))
|
||||
O.show_message(text("\red [user] has fixed some of the dents on [src]!"), 1)
|
||||
|
||||
|
||||
else if(istype(W, /obj/item/weapon/cable_coil) && wiresexposed)
|
||||
var/obj/item/weapon/cable_coil/coil = W
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
..()
|
||||
src.modules += new /obj/item/weapon/extinguisher(src)
|
||||
src.modules += new /obj/item/weapon/screwdriver(src)
|
||||
src.modules += new /obj/item/weapon/weldingtool(src)
|
||||
src.modules += new /obj/item/weapon/weldingtool/largetank(src)
|
||||
src.modules += new /obj/item/weapon/wrench(src)
|
||||
src.modules += new /obj/item/device/analyzer(src)
|
||||
src.modules += new /obj/item/device/flashlight(src)
|
||||
|
||||
@@ -1381,7 +1381,7 @@
|
||||
namecounts[name] = 1
|
||||
creatures[name] = D
|
||||
|
||||
for (var/obj/machinery/the_singularity/S in world)
|
||||
for (var/obj/machinery/singularity/S in world)
|
||||
var/name = "Singularity"
|
||||
if (name in names)
|
||||
namecounts[name]++
|
||||
|
||||
@@ -3,6 +3,7 @@ mob/new_player
|
||||
|
||||
var/datum/preferences/preferences
|
||||
var/ready = 0
|
||||
var/spawning = 0
|
||||
|
||||
invisibility = 101
|
||||
|
||||
@@ -80,6 +81,8 @@ mob/new_player
|
||||
Logout()
|
||||
ready = 0
|
||||
..()
|
||||
if(!spawning)
|
||||
del(src)
|
||||
return
|
||||
|
||||
verb
|
||||
@@ -142,6 +145,8 @@ mob/new_player
|
||||
if(alert(src,"Are you sure you wish to observe? You will not be able to play this round!","Player Setup","Yes","No") == "Yes")
|
||||
var/mob/dead/observer/observer = new()
|
||||
|
||||
src.spawning = 1
|
||||
|
||||
close_spawn_windows()
|
||||
var/obj/O = locate("landmark*Observer-Start")
|
||||
src << "\blue Now teleporting."
|
||||
@@ -397,6 +402,7 @@ mob/new_player
|
||||
src << browse(dat, "window=latechoices;size=300x640;can_close=0")
|
||||
|
||||
proc/create_character()
|
||||
src.spawning = 1
|
||||
var/mob/living/carbon/human/new_character = new(src.loc)
|
||||
|
||||
close_spawn_windows()
|
||||
|
||||
Reference in New Issue
Block a user