cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-21 03:52:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution.

Browse Source
This commit is contained in:
Zuhayr
2014-12-13 23:10:46 +10:30
parent eafaef5cfa 75d163705a
commit d2803ec4d7
29 changed files with 411 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/manuals.dm
+7 -7
View File
@@ -13,7 +13,7 @@
author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
title = "Station Repairs and Construction"
/obj/item/weapon/book/manual/engineering_construction/New()
/obj/item/weapon/book/manual/engineering_construction/initialize()
..()
dat = {"
@@ -34,7 +34,7 @@
author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
title = "Particle Accelerator User's Guide"
/obj/item/weapon/book/manual/engineering_particle_accelerator/New()
/obj/item/weapon/book/manual/engineering_particle_accelerator/initialize()
..()
dat = {"<html>
<head>
@@ -81,7 +81,7 @@
author = "Waleed Asad"
title = "Supermatter Engine User's Guide"
/obj/item/weapon/book/manual/supermatter_engine/New()
/obj/item/weapon/book/manual/supermatter_engine/initialize()
..()
dat = {"<html>
<head>
@@ -193,7 +193,7 @@
author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
title = "Hacking"
/obj/item/weapon/book/manual/engineering_hacking/New()
/obj/item/weapon/book/manual/engineering_hacking/initialize()
..()
dat = {"
@@ -750,7 +750,7 @@
author = "NanoTrasen"
title = "Corporate Regulations"
/obj/item/weapon/book/manual/security_space_law/New()
/obj/item/weapon/book/manual/security_space_law/initialize()
..()
dat = {"
@@ -774,7 +774,7 @@
author = "NanoTrasen Medicine Department"
title = "NT Medical Diagnostics Manual"
/obj/item/weapon/book/manual/medical_diagnostics_manual/New()
/obj/item/weapon/book/manual/medical_diagnostics_manual/initialize()
..()
dat = {"<html>
<head>
@@ -821,7 +821,7 @@
author = "Engineering Encyclopedia"
title = "Engineering Textbook"
/obj/item/weapon/book/manual/engineering_guide/New()
/obj/item/weapon/book/manual/engineering_guide/initialize()
..()
dat = {"
code/game/objects/objs.dm
+6
View File
@@ -16,6 +16,12 @@
var/damtype = "brute"
var/force = 0
/obj/New()
..()
// If the game is already underway initialize will no longer be called for us
if(ticker && ticker.current_state == GAME_STATE_PLAYING)
initialize()
/obj/Topic(href, href_list, var/nowindow = 0)
// Calling Topic without a corresponding window open causes runtime errors
if(nowindow)
code/game/objects/structures/coathanger.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/coatrack.dmi'
icon_state = "coatrack0"
var/obj/item/clothing/suit/coat
var/list/allowed = list(/obj/item/clothing/suit/storage/labcoat, /obj/item/clothing/suit/storage/det_suit)
var/list/allowed = list(/obj/item/clothing/suit/storage/labcoat, /obj/item/clothing/suit/storage/toggle/labcoat, /obj/item/clothing/suit/storage/det_suit)
/obj/structure/coatrack/attack_hand(mob/user as mob)
user.visible_message("[user] takes [coat] off \the [src].", "You take [coat] off the \the [src]")