cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commented out buildmode until it can be fixed.

Browse Source 
More sanity checks for DNA modification.
Updated the metal, plasteel, glass and r-glass sprites. They're a lot smaller now.
Removed that stupid knife zippo sprite.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3145 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-02-18 16:27:08 +00:00
parent 75a35847d8
commit e0230b2ff0
7 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/buildmode.dm
View File

@@ -1,3 +1,5 @@
//BUILD MODE SUCKS -Pete
/proc/togglebuildmode(mob/M as mob in world)
set name = "Toggle Build Mode"
set category = "Special Verbs"

3
code/datums/datumvars.dm
View File

@@ -477,6 +477,8 @@ client
if(!src.holder)
return
src.cmd_admin_gib(MOB)
////I'm removing buildmode because it's shitty and runtimes a lot. -Pete
/*
else if (href_list["build_mode"])
if(!href_list["build_mode"])
return
@@ -489,6 +491,7 @@ client
return
togglebuildmode(MOB)
href_list["datumrefresh"] = href_list["build_mode"]
*/
else if (href_list["delall"])
if(!href_list["delall"])
return

3
code/game/atom_procs.dm
View File

@@ -260,9 +260,12 @@
/atom/Click(location,control,params)
//world << "atom.Click() on [src] by [usr] : src.type is [src.type]"
////I'm removing buildmode because it's shitty and runtimes a lot. -Pete
/*
if(usr.client.buildmode)
build_click(usr, usr.client.buildmode, location, control, params, src)
return
*/
if(using_new_click_proc) //TODO ERRORAGE (see message below)
return DblClickNew()
return DblClick(location, control, params)

18
code/game/dna.dm
View File

@@ -1029,7 +1029,7 @@
if (src.buffer3) src.temphtml += text("<A href='?src=\ref[];b3clear=1'>Clear Buffer</A><BR><BR>", src)
if (!src.buffer3) src.temphtml += "<BR>"
if (href_list["b1addui"])
if(src.connected.occupant)
if(src.connected.occupant && src.connected.occupant.dna)
src.buffer1iue = 0
src.buffer1 = src.connected.occupant.dna.uni_identity
if (!istype(src.connected.occupant,/mob/living/carbon/human))
@@ -1040,7 +1040,7 @@
src.buffer1type = "ui"
dopage(src,"buffermenu")
if (href_list["b1adduiue"])
if(src.connected.occupant)
if(src.connected.occupant && src.connected.occupant.dna)
src.buffer1 = src.connected.occupant.dna.uni_identity
if (!istype(src.connected.occupant,/mob/living/carbon/human))
src.buffer1owner = src.connected.occupant.name
@@ -1051,7 +1051,7 @@
src.buffer1iue = 1
dopage(src,"buffermenu")
if (href_list["b2adduiue"])
if(src.connected.occupant)
if(src.connected.occupant && src.connected.occupant.dna)
src.buffer2 = src.connected.occupant.dna.uni_identity
if (!istype(src.connected.occupant,/mob/living/carbon/human))
src.buffer2owner = src.connected.occupant.name
@@ -1062,7 +1062,7 @@
src.buffer2iue = 1
dopage(src,"buffermenu")
if (href_list["b3adduiue"])
if(src.connected.occupant)
if(src.connected.occupant && src.connected.occupant.dna)
src.buffer3 = src.connected.occupant.dna.uni_identity
if (!istype(src.connected.occupant,/mob/living/carbon/human))
src.buffer3owner = src.connected.occupant.name
@@ -1073,7 +1073,7 @@
src.buffer3iue = 1
dopage(src,"buffermenu")
if (href_list["b2addui"])
if(src.connected.occupant)
if(src.connected.occupant && src.connected.occupant.dna)
src.buffer2iue = 0
src.buffer2 = src.connected.occupant.dna.uni_identity
if (!istype(src.connected.occupant,/mob/living/carbon/human))
@@ -1084,7 +1084,7 @@
src.buffer2type = "ui"
dopage(src,"buffermenu")
if (href_list["b3addui"])
if(src.connected.occupant)
if(src.connected.occupant && src.connected.occupant.dna)
src.buffer3iue = 0
src.buffer3 = src.connected.occupant.dna.uni_identity
if (!istype(src.connected.occupant,/mob/living/carbon/human))
@@ -1095,7 +1095,7 @@
src.buffer3type = "ui"
dopage(src,"buffermenu")
if (href_list["b1addse"])
if(src.connected.occupant)
if(src.connected.occupant && src.connected.occupant.dna)
src.buffer1iue = 0
src.buffer1 = src.connected.occupant.dna.struc_enzymes
if (!istype(src.connected.occupant,/mob/living/carbon/human))
@@ -1106,7 +1106,7 @@
src.buffer1type = "se"
dopage(src,"buffermenu")
if (href_list["b2addse"])
if(src.connected.occupant)
if(src.connected.occupant && src.connected.occupant.dna)
src.buffer2iue = 0
src.buffer2 = src.connected.occupant.dna.struc_enzymes
if (!istype(src.connected.occupant,/mob/living/carbon/human))
@@ -1117,7 +1117,7 @@
src.buffer2type = "se"
dopage(src,"buffermenu")
if (href_list["b3addse"])
if(src.connected.occupant)
if(src.connected.occupant && src.connected.occupant.dna)
src.buffer3iue = 0
src.buffer3 = src.connected.occupant.dna.struc_enzymes
if (!istype(src.connected.occupant,/mob/living/carbon/human))

9
code/modules/admin/admin_verbs.dm
View File

@@ -200,7 +200,7 @@
verbs += /client/proc/cmd_admin_delete
//verbs += /proc/togglebuildmode --now in view vars
verbs += /client/proc/toggleadminhelpsound
verbs += /client/proc/togglebuildmodeself
// verbs += /client/proc/togglebuildmodeself
verbs += /client/proc/hide_most_verbs
verbs += /client/proc/tension_report
verbs += /client/proc/jumptocoord
@@ -346,7 +346,7 @@
verbs -= /client/proc/cmd_admin_delete
//verbs -= /proc/togglebuildmode --now in view vars
verbs -= /client/proc/toggleadminhelpsound
verbs -= /client/proc/togglebuildmodeself
// verbs -= /client/proc/togglebuildmodeself
verbs -= /client/proc/cmd_admin_remove_plasma
verbs -= /client/proc/admin_call_shuttle
verbs -= /client/proc/admin_cancel_shuttle
@@ -614,11 +614,14 @@
for (var/mob/V in hearers(O))
V.show_message(message, 2)
////I'm removing buildmode because it's shitty and runtimes a lot. -Pete
/*
/client/proc/togglebuildmodeself()
set name = "Toggle Build Mode Self"
set category = "Special Verbs"
if(src.mob)
togglebuildmode(src.mob)
*/
/client/proc/toggleadminhelpsound()
set name = "Toggle Adminhelp Sound"
@@ -718,7 +721,7 @@
//verbs += /client/proc/cmd_modify_object_variables --merged with view vairiables
verbs += /client/proc/Jump
verbs += /client/proc/jumptoturf
verbs += /client/proc/togglebuildmodeself
// verbs += /client/proc/togglebuildmodeself
verbs += /client/proc/dsay
verbs += /client/proc/admin_play

BIN
icons/obj/items.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 50 KiB

1
tgstation.dme
View File

@@ -996,7 +996,6 @@
#include "code\modules\research\server.dm"
#include "code\modules\security levels\keycard authentication.dm"
#include "code\modules\security levels\security levels.dm"
#include "code\WorkInProgress\buildmode.dm"
#include "code\WorkInProgress\explosion_particles.dm"
#include "code\WorkInProgress\mapload\dmm_suite.dm"
#include "code\WorkInProgress\mapload\reader.dm"