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

12/21 modernizations from TG live (#103)

Browse Source 
* sync (#3)

* shuttle auto call

* Merge /vore into /master (#39)

* progress

* Compile errors fixed

No idea if it's test worthy tho as conflicts with race overhaul and
narky removal.

* Update admins.txt

* efforts continue

Fuck grab code, seriously

* grab code is cancer

* Execute the Narkism

Do not hesitate.

Show no mercy.

* holy shit grab code is awful

* have I bitched about grab code

My bitching, let me show you it

* código de agarre es una mierda

No really it is

* yeah I don't even know anymore.

* Lolnope. Fuck grab code

* I'm not even sure what to fix anymore

* Self eating is not an acceptable fate

* Taste the void, son.

* My code doesn't pass it's own sanity check.

Maybe it's a sign of things to come.

* uncommented and notes

* It Works and I Don't Know Why (#38)

* shuttle auto call

* it works and I don't know why

* Subsystem 12/21

Most Recent TG subsystem folder

* globalvars 12/21

Tossed out the flavor_misc and parallax files

* Onclick 12/21

as well as .dme updates

* _defines 12/21

ommited old _MC.dm

* _HELPERS 12/21

Preserved snowflake placement of furry sprites

* _defeines/genetics

reapplied narkism holdover for snowflake races.

* Oops forgot mutant colors

* modules porting 12/21 + Sounds/icons

Admin, Client and most of mob life files ommitted

* enviroment file

* Admin optimizations

ahelp log system kept

* Mob ports 12/21

Flavor text preserved

* datums ported 12/21

* Game ported 12/21

* batch of duplicate fixes/dogborg work

Dogborgs need to be modernized to refractored borg standards.

* moar fixes

* Maps and futher compile fixes
This commit is contained in:
Poojawa
2016-12-22 03:57:55 -06:00
committed by GitHub
parent f5e143a452
commit cf59ac1c3d
2215 changed files with 707445 additions and 87041 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/pipe/construction.dm
+9 -8
View File
@@ -13,10 +13,11 @@ Buildable meters
var/pipe_type = 0
var/pipename
force = 7
throwforce = 7
icon = 'icons/obj/atmospherics/pipes/pipe_item.dmi'
icon_state = "simple"
item_state = "buildpipe"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
level = 2
var/flipped = 0
var/is_bent = 0
@@ -54,7 +55,7 @@ Buildable meters
if(make_from)
src.setDir(make_from.dir)
src.pipename = make_from.name
src.color = make_from.color
add_atom_colour(make_from.color, FIXED_COLOUR_PRIORITY)
if(make_from.type in pipe_types)
src.pipe_type = make_from.type
@@ -230,9 +231,9 @@ var/global/list/pipeID2State = list(
var/obj/machinery/atmospherics/components/trinary/T = A
if(istype(T))
T.flipped = flipped
A.construction(pipe_type, color)
A.on_construction(pipe_type, color)
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
playsound(src.loc, W.usesound, 50, 1)
user.visible_message( \
"[user] fastens \the [src].", \
"<span class='notice'>You fasten \the [src].</span>", \
@@ -241,8 +242,8 @@ var/global/list/pipeID2State = list(
qdel(src)
/obj/item/pipe/suicide_act(mob/user)
if (pipe_type in list(PIPE_PUMP, PIPE_PASSIVE_GATE, PIPE_VOLUME_PUMP))
user.visible_message("<span class='suicide'>[user] shoved the [src] in \his mouth and turned it on! It looks like \he's trying to commit suicide.</span>")
if(pipe_type in list(PIPE_PUMP, PIPE_PASSIVE_GATE, PIPE_VOLUME_PUMP))
user.visible_message("<span class='suicide'>[user] shoves the [src] in [user.p_their()] mouth and turns it on! It looks like [user.p_theyre()] trying to commit suicide!</span>")
if(istype(user, /mob/living/carbon))
var/mob/living/carbon/C = user
for(var/i=1 to 20)
@@ -259,7 +260,7 @@ var/global/list/pipeID2State = list(
icon = 'icons/obj/atmospherics/pipes/pipe_item.dmi'
icon_state = "meter"
item_state = "buildpipe"
w_class = 4
w_class = WEIGHT_CLASS_BULKY
/obj/item/pipe_meter/attackby(obj/item/weapon/W, mob/user, params)
..()
@@ -270,6 +271,6 @@ var/global/list/pipeID2State = list(
user << "<span class='warning'>You need to fasten it to a pipe!</span>"
return 1
new/obj/machinery/meter( src.loc )
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
playsound(src.loc, W.usesound, 50, 1)
user << "<span class='notice'>You fasten the meter to the pipe.</span>"
qdel(src)
code/game/machinery/pipe/pipe_dispenser.dm
+34 -40
View File
@@ -79,9 +79,9 @@
return
else if (istype(W, /obj/item/weapon/wrench))
if (!anchored && !isinspace())
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
playsound(src.loc, W.usesound, 50, 1)
user << "<span class='notice'>You begin to fasten \the [src] to the floor...</span>"
if (do_after(user, 40/W.toolspeed, target = src))
if (do_after(user, 40*W.toolspeed, target = src))
add_fingerprint(user)
user.visible_message( \
"[user] fastens \the [src].", \
@@ -92,9 +92,9 @@
if (usr.machine==src)
usr << browse(null, "window=pipedispenser")
else if(anchored)
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
playsound(src.loc, W.usesound, 50, 1)
user << "<span class='notice'>You begin to unfasten \the [src] from the floor...</span>"
if (do_after(user, 20/W.toolspeed, target = src))
if (do_after(user, 20*W.toolspeed, target = src))
add_fingerprint(user)
user.visible_message( \
"[user] unfastens \the [src].", \
@@ -195,16 +195,16 @@ Nah
return 1
var/dat = {"<B>Transit Tubes:</B><BR>
<A href='?src=\ref[src];tube=0'>Straight Tube</A><BR>
<A href='?src=\ref[src];tube=1'>Straight Tube with Crossing</A><BR>
<A href='?src=\ref[src];tube=2'>Curved Tube</A><BR>
<A href='?src=\ref[src];tube=3'>Diagonal Tube</A><BR>
<A href='?src=\ref[src];tube=4'>Junction</A><BR>
<A href='?src=\ref[src];tube=[TRANSIT_TUBE_STRAIGHT]'>Straight Tube</A><BR>
<A href='?src=\ref[src];tube=[TRANSIT_TUBE_STRAIGHT_CROSSING]'>Straight Tube with Crossing</A><BR>
<A href='?src=\ref[src];tube=[TRANSIT_TUBE_CURVED]'>Curved Tube</A><BR>
<A href='?src=\ref[src];tube=[TRANSIT_TUBE_DIAGONAL]'>Diagonal Tube</A><BR>
<A href='?src=\ref[src];tube=[TRANSIT_TUBE_DIAGONAL_CROSSING]'>Diagonal Tube with Crossing</A><BR>
<A href='?src=\ref[src];tube=[TRANSIT_TUBE_JUNCTION]'>Junction</A><BR>
<b>Station Equipment:</b><BR>
<A href='?src=\ref[src];tube=5'>Through Tube Station</A><BR>
<A href='?src=\ref[src];tube=6'>Terminus Tube Station</A><BR>
<A href='?src=\ref[src];tube=7'>Tube Blocker</A><BR>
<A href='?src=\ref[src];tube=8'>Transit Tube Pod</A><BR>
<A href='?src=\ref[src];tube=[TRANSIT_TUBE_STATION]'>Through Tube Station</A><BR>
<A href='?src=\ref[src];tube=[TRANSIT_TUBE_TERMINUS]'>Terminus Tube Station</A><BR>
<A href='?src=\ref[src];tube=[TRANSIT_TUBE_POD]'>Transit Tube Pod</A><BR>
"}
user << browse("<HEAD><TITLE>[src]</TITLE></HEAD><TT>[dat]</TT>", "window=pipedispenser")
@@ -219,34 +219,28 @@ Nah
if(!wait)
if(href_list["tube"])
var/tube_type = text2num(href_list["tube"])
if(tube_type <= 4)
var/obj/structure/c_transit_tube/C = new/obj/structure/c_transit_tube(src.loc)
switch(tube_type)
if(0)
C.icon_state = "E-W"
if(1)
C.icon_state = "E-W-Pass"
if(2)
C.icon_state = "S-NE"
if(3)
C.icon_state = "NE-SW"
if(4)
C.icon_state = "W-NE-SE"
var/obj/structure/C
switch(tube_type)
if(TRANSIT_TUBE_STRAIGHT)
C = new /obj/structure/c_transit_tube(loc)
if(TRANSIT_TUBE_STRAIGHT_CROSSING)
C = new /obj/structure/c_transit_tube/crossing(loc)
if(TRANSIT_TUBE_CURVED)
C = new /obj/structure/c_transit_tube/curved(loc)
if(TRANSIT_TUBE_DIAGONAL)
C = new /obj/structure/c_transit_tube/diagonal(loc)
if(TRANSIT_TUBE_DIAGONAL_CROSSING)
C = new /obj/structure/c_transit_tube/diagonal/crossing(loc)
if(TRANSIT_TUBE_JUNCTION)
C = new /obj/structure/c_transit_tube/junction(loc)
if(TRANSIT_TUBE_STATION)
C = new /obj/structure/c_transit_tube/station(loc)
if(TRANSIT_TUBE_TERMINUS)
C = new /obj/structure/c_transit_tube/station/reverse(loc)
if(TRANSIT_TUBE_POD)
C = new /obj/structure/c_transit_tube_pod(loc)
if(C)
C.add_fingerprint(usr)
else
switch(tube_type)
if(5)
var/obj/structure/c_transit_tube/station/C = new/obj/structure/c_transit_tube/station(src.loc)
C.add_fingerprint(usr)
if(6)
var/obj/structure/c_transit_tube/station/reverse/C = new/obj/structure/c_transit_tube/station/reverse(src.loc)
C.add_fingerprint(usr)
if(7)
var/obj/structure/c_transit_tube/station/block/C = new/obj/structure/c_transit_tube/station/block(src.loc)
C.add_fingerprint(usr)
if(8)
var/obj/structure/c_transit_tube_pod/C = new/obj/structure/c_transit_tube_pod(src.loc)
C.add_fingerprint(usr)
wait = 1
spawn(15)
wait = 0