shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tg port 2 15 (#230)

Browse Source 
* defines/helpers

* globalvars, onclick, controllers

* datums and game

* woooooooooorld. Uh. dm

* modules sans mobs client admin

* modules/admin

* pref shit

* modules/mob

* icon updates

* extra things

* Cherrypicked fixes from open PRs

* metastation.tgm fix

* a better meta fix

* reverts async breakings
This commit is contained in:
Poojawa
2017-02-15 03:35:32 -06:00
committed by GitHub
parent fd3923d684
commit fc2dbcd9fe
192 changed files with 10451 additions and 160669 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/buildandrepair.dm
+4 -1
View File
@@ -175,7 +175,10 @@
name = "circuit board (Xenobiology Console)"
build_path = /obj/machinery/computer/camera_advanced/xenobio
origin_tech = "programming=3;bio=3"
/obj/item/weapon/circuitboard/computer/base_construction
name = "circuit board (Aux Mining Base Construction Console)"
build_path = /obj/machinery/computer/camera_advanced/base_construction
origin_tech = "programming=3;engineering=3"
/obj/item/weapon/circuitboard/computer/aiupload
name = "AI Upload (Computer Board)"
build_path = /obj/machinery/computer/upload/ai
code/game/machinery/computer/communications.dm
+2 -2
View File
@@ -127,7 +127,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
make_announcement(usr)
/* if("crossserver")
if("crossserver")
if(authenticated==2)
if(CM.lastTimeUsed + 600 > world.time)
usr << "<span class='warning'>Arrays recycling. Please stand by.</span>"
@@ -142,7 +142,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
log_say("[key_name(usr)] has sent a message to the other server: [input]")
message_admins("[key_name_admin(usr)] has sent a message to the other server.")
CM.lastTimeUsed = world.time
*/
if("purchase_menu")
state = STATE_PURCHASE
code/game/machinery/computer/gulag_teleporter.dm
+1 -1
View File
@@ -144,7 +144,7 @@
/obj/machinery/computer/gulag_teleporter_computer/proc/teleport(mob/user)
log_game("[user]([user.ckey] teleported [prisoner]([prisoner.ckey]) to the Labor Camp ([beacon.x], [beacon.y], [beacon.z]) for [id.goal] points.")
teleporter.handle_prisoner(id, temporary_record)
playsound(loc, "sound/weapons/emitter.ogg", 50, 1)
playsound(loc, 'sound/weapons/emitter.ogg', 50, 1)
prisoner.forceMove(get_turf(beacon))
prisoner.Weaken(2) // small travel dizziness
prisoner << "<span class='warning'>The teleportation makes you a little dizzy.</span>"
code/game/machinery/doors/airlock_types.dm
+1 -1
View File
@@ -489,7 +489,7 @@
new/obj/item/stack/tile/brass(T, 4)
else
new/obj/item/clockwork/alloy_shards(T)
new/obj/item/clockwork/component/vanguard_cogwheel/pinion_lock(T)
new/obj/item/clockwork/alloy_shards/pinion_lock(T)
qdel(src)
/obj/machinery/door/airlock/clockwork/proc/attempt_construction(obj/item/I, mob/living/user)
code/game/machinery/firealarm.dm
+1 -1
View File
@@ -96,7 +96,7 @@
return
var/area/A = get_area(src)
A.firealert(src)
playsound(src.loc, 'goon/sound/machinery/FireAlarm.ogg', 75, 0)
playsound(src.loc, 'goon/sound/machinery/FireAlarm.ogg', 75, 1)
/obj/machinery/firealarm/proc/alarm_in(time)
addtimer(CALLBACK(src, .proc/alarm), time)
code/game/machinery/porta_turret/portable_turret.dm
+22
View File
@@ -569,6 +569,28 @@
/obj/machinery/porta_turret/ai/assess_perp(mob/living/carbon/human/perp)
return 10 //AI turrets shoot at everything not in their faction
/obj/machinery/porta_turret/aux_base
name = "perimeter defense turret"
desc = "A plasma cutter turret calibrated to defend outposts against non-humanoid fauna."
req_access = list() //Can be disabled/enabled by any humanoid!
installation = null
lethal_projectile = /obj/item/projectile/plasma
lethal_projectile_sound = 'sound/weapons/plasma_cutter.ogg'
mode = TURRET_LETHAL //It would be useless in stun mode anyway
faction = "neutral" //Minebots, medibots, etc that should not be shot.
/obj/machinery/porta_turret/aux_base/assess_perp(mob/living/carbon/human/perp)
return 0 //Never shoot humanoids. You are on your own if Ashwalkers or the like attack!
/obj/machinery/porta_turret/aux_base/setup()
return
/obj/machinery/porta_turret/aux_base/New()
..()
cover.name = name
cover.desc = desc
////////////////////////
//Turret Control Panel//
////////////////////////
code/game/machinery/vending.dm
+58 -34
View File
@@ -728,6 +728,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up = 10,
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime = 10)
contraband = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko = 6)
premium = list(/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1)
refill_canister = /obj/item/weapon/vending_refill/cola
//This one's from bay12
@@ -917,40 +918,63 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/item/clothing/head/cueball = 1,
/obj/item/clothing/under/scratch = 1,
/obj/item/clothing/under/sailor=1,
/obj/item/clothing/shoes/megaboots=1,
/obj/item/clothing/gloves/megagloves=1,
/obj/item/clothing/head/helmet/megahelmet=1,
/obj/item/clothing/shoes/megaboots=1,
/obj/item/clothing/gloves/megagloves=1,
/obj/item/clothing/head/helmet/megahelmet=1,
/obj/item/clothing/under/mega=1,
/obj/item/clothing/shoes/protoboots=1,
/obj/item/clothing/gloves/protogloves=1,
/obj/item/clothing/head/helmet/protohelmet = 1,
/obj/item/clothing/shoes/protoboots=1,
/obj/item/clothing/gloves/protogloves=1,
/obj/item/clothing/head/helmet/protohelmet = 1,
/obj/item/clothing/under/proto = 1,
/obj/item/clothing/shoes/megaxboots = 1,
/obj/item/clothing/gloves/megaxgloves = 1,
/obj/item/clothing/head/helmet/megaxhelmet = 1,
/obj/item/clothing/shoes/megaxboots = 1,
/obj/item/clothing/gloves/megaxgloves = 1,
/obj/item/clothing/head/helmet/megaxhelmet = 1,
/obj/item/clothing/under/megax = 1,
/obj/item/clothing/shoes/joeboots = 1,
/obj/item/clothing/gloves/joegloves = 1,
/obj/item/clothing/shoes/joeboots = 1,
/obj/item/clothing/gloves/joegloves = 1,
/obj/item/clothing/head/helmet/joehelmet = 1,
/obj/item/clothing/under/joe = 1,
/obj/item/clothing/under/vault = 1,
/obj/item/clothing/under/roll = 1,
/obj/item/clothing/head/clownpiece = 1,
/obj/item/clothing/under/clownpiece = 1,
/obj/item/clothing/suit/clownpiece = 1)
contraband = list(/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 2,/obj/item/clothing/glasses/sunglasses/garb = 2,
/obj/item/clothing/gloves/anchor_arms = 1,
/obj/item/clothing/suit/kaminacape = 1,
/obj/item/clothing/under/soldieruniform = 1, /obj/item/clothing/head/stalhelm = 1, /obj/item/clothing/suit/soldiercoat = 1,
/obj/item/clothing/under/officeruniform = 1, /obj/item/clothing/head/naziofficer = 1, /obj/item/clothing/suit/officercoat = 1,
/obj/item/clothing/head/panzer = 1,
/obj/item/clothing/under/russobluecamooutfit = 1, /obj/item/clothing/head/russobluecamohat = 1,
/obj/item/clothing/suit/russofurcoat = 1, /obj/item/clothing/head/russofurhat = 1,
/obj/item/clothing/under/rottensuit = 1, /obj/item/clothing/shoes/rottenshoes = 1,
/obj/item/clothing/head/helmet/biker = 1, /obj/item/clothing/under/bikersuit = 1, /obj/item/clothing/gloves/bikergloves = 1,
/obj/item/clothing/under/jacketsuit = 1, /obj/item/clothing/head/helmet/richard = 1,
/obj/item/clothing/under/vault13 = 1)
premium = list(/obj/item/clothing/suit/pirate/captain = 2, /obj/item/clothing/head/pirate/captain = 2, /obj/item/clothing/head/helmet/roman = 1, /obj/item/clothing/head/helmet/roman/legionaire = 1, /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1, /obj/item/weapon/shield/riot/roman = 1, /obj/item/weapon/skub = 1)
/obj/item/clothing/head/clownpiece = 1,
/obj/item/clothing/under/clownpiece = 1,
/obj/item/clothing/suit/clownpiece = 1
)
contraband = list(/obj/item/clothing/suit/judgerobe = 1,
/obj/item/clothing/head/powdered_wig = 1,
/obj/item/weapon/gun/magic/wand = 2,
/obj/item/clothing/glasses/sunglasses/garb = 2,
/obj/item/clothing/gloves/anchor_arms = 1,
/obj/item/clothing/suit/kaminacape = 1,
/obj/item/clothing/under/soldieruniform = 1,
/obj/item/clothing/head/stalhelm = 1,
/obj/item/clothing/suit/soldiercoat = 1,
/obj/item/clothing/under/officeruniform = 1,
/obj/item/clothing/head/naziofficer = 1,
/obj/item/clothing/suit/officercoat = 1,
/obj/item/clothing/head/panzer = 1,
/obj/item/clothing/under/russobluecamooutfit = 1,
/obj/item/clothing/head/russobluecamohat = 1,
/obj/item/clothing/suit/russofurcoat = 1,
/obj/item/clothing/head/russofurhat = 1,
/obj/item/clothing/under/rottensuit = 1,
/obj/item/clothing/shoes/rottenshoes = 1,
/obj/item/clothing/head/helmet/biker = 1,
/obj/item/clothing/under/bikersuit = 1,
/obj/item/clothing/gloves/bikergloves = 1,
/obj/item/clothing/under/jacketsuit = 1,
/obj/item/clothing/head/helmet/richard = 1,
/obj/item/clothing/under/vault13 = 1
)
premium = list(/obj/item/clothing/suit/pirate/captain = 2,
/obj/item/clothing/head/pirate/captain = 2,
/obj/item/clothing/head/helmet/roman = 1,
/obj/item/clothing/head/helmet/roman/legionaire = 1,
/obj/item/clothing/under/roman = 1,
/obj/item/clothing/shoes/roman = 1,
/obj/item/weapon/shield/riot/roman = 1,
/obj/item/weapon/skub = 1
)
refill_canister = /obj/item/weapon/vending_refill/autodrobe
/obj/machinery/vending/dinnerware
@@ -1062,14 +1086,14 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/item/clothing/suit/jacket/letterman_red=1, /obj/item/clothing/under/wintercasualwear=1, /obj/item/clothing/under/casualwear=1, /obj/item/clothing/under/casualhoodie=1,
/obj/item/clothing/under/casualhoodie/skirt=1)
contraband = list(/obj/item/clothing/under/syndicate/tacticool=1,/obj/item/clothing/mask/balaclava=1,/obj/item/clothing/head/ushanka=1,/obj/item/clothing/under/soviet=1,/obj/item/weapon/storage/belt/fannypack/black=2,/obj/item/clothing/suit/jacket/letterman_syndie=1,/obj/item/clothing/under/jabroni=1, /obj/item/clothing/suit/vapeshirt=1, /obj/item/clothing/under/geisha=1,
/obj/item/clothing/under/wedding/bride_orange=1,
/obj/item/clothing/under/wedding/bride_purple=1,
/obj/item/clothing/under/wedding/bride_blue=1,
/obj/item/clothing/under/wedding/bride_red=1,
/obj/item/clothing/under/wedding/bride_white=1,
/obj/item/clothing/under/wedding/bride_orange=1,
/obj/item/clothing/under/wedding/bride_purple=1,
/obj/item/clothing/under/wedding/bride_blue=1,
/obj/item/clothing/under/wedding/bride_red=1,
/obj/item/clothing/under/wedding/bride_white=1,
/obj/item/clothing/under/keyholesweater=1,
/obj/item/clothing/suit/doshjacket=1,
/obj/item/clothing/under/squatter_outfit = 1,
/obj/item/clothing/suit/doshjacket=1,
/obj/item/clothing/under/squatter_outfit = 1,
/obj/item/clothing/head/squatter_hat = 1)
premium = list(/obj/item/clothing/under/suit_jacket/checkered=1,/obj/item/clothing/head/mailman=1,/obj/item/clothing/under/rank/mailman=1,/obj/item/clothing/suit/jacket/leather=1,/obj/item/clothing/suit/jacket/leather/overcoat=1,/obj/item/clothing/under/pants/mustangjeans=1,/obj/item/clothing/neck/necklace/dope=3,/obj/item/clothing/suit/jacket/letterman_nanotrasen=1)
refill_canister = /obj/item/weapon/vending_refill/clothing