cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess

Browse Source 
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/modules/projectiles/guns/projectile/launchers.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	code/modules/research/designs/weapon_designs.dm
	icons/obj/gun.dmi
This commit is contained in:
paprka
2015-01-15 21:56:23 -08:00
parent 2fd8b3e749 63e09d0928
commit ab7d50c90e
156 changed files with 2999 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/landmarks.dm
+4
View File
@@ -59,6 +59,10 @@
deathsquadspawn += loc
qdel(src)
return
if("Emergencyresponseteam")
emergencyresponseteamspawn += loc
qdel(src)
return
if("xeno_spawn")
xeno_spawn += loc
qdel(src)
code/game/objects/items/devices/PDA/PDA.dm
+2 -2
View File
@@ -809,7 +809,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if (!P.silent)
playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1)
P.loc.audible_message("\icon[P] *[P.ttone]*", null, 3)
P.audible_message("\icon[P] *[P.ttone]*", null, 3)
//Search for holder of the PDA.
var/mob/living/L = null
if(P.loc && isliving(P.loc))
@@ -1150,7 +1150,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
else
ntrclog[channel] = msg + ntrclog[channel]
if (findtext(message, nick) && !silent)
loc.audible_message("\icon[src] *[ttone]*", null, 3)
audible_message("\icon[src] *[ttone]*", null, 3)
new_ntrc_msg++
/obj/item/device/pda/proc/setup_chatrooms() //this can't be done on New() because the messaging server needs to be instanced first
code/game/objects/items/weapons/cards_ids.dm
+31
View File
@@ -190,6 +190,37 @@ update_label("John Doe", "Clowny")
New()
access = get_all_centcom_access()
..()
/obj/item/weapon/card/id/ertsCommand
name = "\improper Centcom ID"
desc = "A ERT ID card"
icon_state = "centcom"
registered_name = "Emergency Response Team Commander"
assignment = "Emergency Response Team Commander"
access = list(access_sec_doors, access_engine, access_medical)
/obj/item/weapon/card/id/ertsSecurity
name = "\improper Centcom ID"
desc = "A ERT ID card"
icon_state = "centcom"
registered_name = "Security Response Officer"
assignment = "Security Response Officer"
access = list(access_sec_doors)
/obj/item/weapon/card/id/ertsEngineer
name = "\improper Centcom ID"
desc = "A ERT ID card"
icon_state = "centcom"
registered_name = "Engineer Response Officer"
assignment = "Engineer Response Officer"
access = list(access_engine)
/obj/item/weapon/card/id/ertsMedical
name = "\improper Centcom ID"
desc = "A ERT ID card"
icon_state = "centcom"
registered_name = "Medical Response Officer"
assignment = "Medical Response Officer"
access = list(access_medical)
/obj/item/weapon/card/id/prisoner
name = "prisoner ID card"
code/game/objects/items/weapons/cigs_lighters.dm
+2 -1
View File
@@ -108,12 +108,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/type_butt = /obj/item/weapon/cigbutt
var/lastHolder = null
var/smoketime = 300
var/chem_volume = 15
var/chem_volume = 30
/obj/item/clothing/mask/cigarette/New()
..()
flags |= NOREACT // so it doesn't react until you light it
create_reagents(chem_volume) // making the cigarette a chemical holder with a maximum volume of 15
reagents.add_reagent("nicotine", 15)
/obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
code/game/objects/items/weapons/implants/implant.dm
+12 -1
View File
@@ -64,7 +64,18 @@
Implant Specifics:<BR>"}
return dat
/obj/item/weapon/implant/weapons_auth
name = "firearms authentication implant"
desc = "Lets you shoot your guns"
icon_state = "auth"
/obj/item/weapon/implant/tracking/get_data()
var/dat = {"<b>Implant Specifications:</b><BR>
<b>Name:</b> Firearms Authentication Implant<BR>
<b>Life:</b> 4 hours after death of host<BR>
<b>Implant Details:</b> <BR>
<b>Function:</b> Allows operation of implant-locked weaponry, preventing equipment from falling into enemy hands."}
return dat
/obj/item/weapon/implant/explosive
name = "explosive implant"
@@ -91,7 +102,7 @@
if(!cause || !imp_in) return 0
if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your explosive implant? This will cause you to explode and gib!", "Explosive Implant Confirmation", "Yes", "No") != "Yes")
return 0
explosion(src, -1, 0, 2, 3, 0) //This might be a bit much, dono will have to see.
explosion(src,0,1,5,7,10, flame_range = 5)
if(imp_in)
imp_in.gib()
code/game/objects/items/weapons/storage/boxes.dm
+15
View File
@@ -433,6 +433,21 @@
new /obj/item/weapon/cartridge/security(src)
new /obj/item/weapon/cartridge/security(src)
/obj/item/weapon/storage/box/firingpins
name = "box of standard firing pins"
desc = "A box full of standard firing pins, to allow newly-developed firearms to operate."
icon_state = "id"
/obj/item/weapon/storage/box/firingpins/New()
..()
new /obj/item/device/firing_pin(src)
new /obj/item/device/firing_pin(src)
new /obj/item/device/firing_pin(src)
new /obj/item/device/firing_pin(src)
new /obj/item/device/firing_pin(src)
new /obj/item/device/firing_pin(src)
new /obj/item/device/firing_pin(src)
/obj/item/weapon/storage/box/handcuffs
name = "box of spare handcuffs"
desc = "A box full of handcuffs."
code/game/objects/items/weapons/storage/uplink_kits.dm
+20 -6
View File
@@ -103,21 +103,21 @@
/*/obj/item/weapon/storage/box/syndie_kit/imp_compress
name = "Compressed Matter Implant (with injector)"
/obj/item/weapon/storage/syndie_kit/imp_compress/New()
/obj/item/weapon/storage/box/syndie_kit/imp_compress/New()
new /obj/item/weapon/implanter/compressed(src)
..()
return
*/
/obj/item/weapon/storage/syndie_kit/imp_explosive
/obj/item/weapon/storage/box/syndie_kit/imp_explosive
name = "Explosive Implant (with injector)"
/obj/item/weapon/storage/syndie_kit/imp_explosive/New()
var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src)
/obj/item/weapon/storage/box/syndie_kit/imp_explosive/New()
var/obj/item/weapon/implanter/O = new(src)
O.imp = new /obj/item/weapon/implant/explosive(O)
O.name = "(BIO-HAZARD) BIO-detpack"
O.update_icon()
..()
return*/
return
/obj/item/weapon/storage/box/syndie_kit/imp_uplink
name = "boxed uplink implant (with injector)"
@@ -152,6 +152,7 @@
new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
return
/obj/item/weapon/storage/box/syndie_kit/emp
name = "boxed EMP kit"
@@ -161,4 +162,17 @@
new /obj/item/weapon/grenade/empgrenade(src)
new /obj/item/weapon/implanter/emp/(src)
new /obj/item/device/flashlight/emp/(src)
return
/obj/item/weapon/storage/box/syndie_kit/chemical
name = "boxed chemical kit"
/obj/item/weapon/storage/box/syndie_kit/chemical/New()
..()
new /obj/item/weapon/reagent_containers/glass/bottle/polonium(src)
new /obj/item/weapon/reagent_containers/glass/bottle/venom(src)
new /obj/item/weapon/reagent_containers/glass/bottle/neurotoxin2(src)
new /obj/item/weapon/reagent_containers/glass/bottle/formaldehyde(src)
new /obj/item/weapon/reagent_containers/glass/bottle/cyanide(src)
new /obj/item/weapon/reagent_containers/glass/bottle/histamine(src)
return
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+1 -1
View File
@@ -20,7 +20,7 @@
new /obj/item/clothing/under/rank/hydroponics(src)
new /obj/item/device/analyzer/plant_analyzer(src)
new /obj/item/device/radio/headset/headset_srv(src)
new /obj/item/clothing/head/greenbandana(src)
new /obj/item/clothing/mask/bandana(src)
new /obj/item/weapon/minihoe(src)
new /obj/item/weapon/hatchet(src)
new /obj/item/clothing/suit/toggle/wintercoat/hydro(src)
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+30
View File
@@ -5,6 +5,36 @@
icon_closed = "syndicate"
icon_opened = "syndicateopen"
/obj/structure/closet/syndicate/ertCom/New()
name = "commanders closet"
desc = "Emergency Response Team equipment locker"
new /obj/item/weapon/card/id/ertsCommand(src)
new /obj/item/weapon/storage/backpack/security(src)
return
/obj/structure/closet/syndicate/ertSec/New()
name = "security closet"
desc = "Emergency Response Team equipment locker"
new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
new /obj/item/weapon/card/id/ertsSecurity(src)
new /obj/item/weapon/storage/backpack/security(src)
return
/obj/structure/closet/syndicate/ertMed/New()
name = "medical closet"
desc = "Emergency Response Team equipment locker"
new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
new /obj/item/weapon/card/id/ertsMedical(src)
new /obj/item/weapon/storage/backpack/medic(src)
return
/obj/structure/closet/syndicate/ertEngi/New()
name = "engineer closet"
desc = "Emergency Response Team equipment locker"
new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
new /obj/item/weapon/card/id/ertsEngineer(src)
new /obj/item/weapon/storage/backpack/industrial(src)
return
/obj/structure/closet/syndicate/personal
desc = "It's a personal storage unit for operative gear."
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+35
View File
@@ -34,6 +34,8 @@
new /obj/item/clothing/head/soft/sec(src)
new /obj/item/clothing/head/soft/sec(src)
new /obj/item/clothing/head/soft/sec(src)
new /obj/item/clothing/mask/bandana/red(src)
new /obj/item/clothing/mask/bandana/red(src)
new /obj/item/clothing/head/santa(src)
new /obj/item/clothing/head/santa(src)
new /obj/item/clothing/head/santa(src)
@@ -73,6 +75,10 @@
new /obj/item/clothing/head/soft/black(src)
new /obj/item/clothing/head/soft/black(src)
new /obj/item/clothing/head/soft/black(src)
new /obj/item/clothing/mask/bandana/black(src)
new /obj/item/clothing/mask/bandana/black(src)
if(prob(40))
new /obj/item/clothing/mask/bandana/skull(src)
return
@@ -107,6 +113,8 @@
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/mask/bandana/green(src)
new /obj/item/clothing/mask/bandana/green(src)
return
@@ -138,6 +146,8 @@
new /obj/item/clothing/shoes/sneakers/orange(src)
new /obj/item/clothing/shoes/sneakers/orange(src)
new /obj/item/clothing/shoes/sneakers/orange(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/mask/bandana/gold(src)
return
@@ -187,6 +197,9 @@
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/clothing/head/soft/mime(src)
new /obj/item/clothing/head/soft/mime(src)
new /obj/item/clothing/head/soft/mime(src)
return
/obj/structure/closet/wardrobe/white/medical
@@ -261,6 +274,10 @@
new /obj/item/clothing/head/soft/black(src)
new /obj/item/clothing/head/soft/black(src)
new /obj/item/clothing/suit/toggle/wintercoat/science(src)
if(prob(40))
new /obj/item/clothing/mask/bandana/skull(src)
if(prob(40))
new /obj/item/clothing/mask/bandana/skull(src)
return
@@ -329,6 +346,9 @@
new /obj/item/clothing/head/soft/grey(src)
new /obj/item/clothing/head/soft/grey(src)
new /obj/item/clothing/head/soft/grey(src)
if(prob(40))
new /obj/item/clothing/mask/bandana/black(src)
new /obj/item/clothing/mask/bandana/black(src)
if(prob(40))
new /obj/item/clothing/under/assistantformal(src)
if(prob(40))
@@ -356,6 +376,21 @@
new /obj/item/clothing/under/color/green(src)
new /obj/item/clothing/under/color/orange(src)
new /obj/item/clothing/under/color/pink(src)
new /obj/item/clothing/under/color/red(src)
new /obj/item/clothing/under/color/lightblue(src)
new /obj/item/clothing/under/color/aqua(src)
new /obj/item/clothing/under/color/purple(src)
new /obj/item/clothing/under/color/lightpurple(src)
new /obj/item/clothing/under/color/lightgreen(src)
new /obj/item/clothing/under/color/darkblue(src)
new /obj/item/clothing/under/color/darkred(src)
new /obj/item/clothing/under/color/lightred(src)
new /obj/item/clothing/mask/bandana/red(src)
new /obj/item/clothing/mask/bandana/red(src)
new /obj/item/clothing/mask/bandana/blue(src)
new /obj/item/clothing/mask/bandana/blue(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/mask/bandana/gold(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/clothing/shoes/sneakers/white(src)
code/game/objects/structures/watercloset.dm
-1
View File
@@ -130,7 +130,6 @@
user << "<span class='notice'>You need a tighter grip.</span>"
/obj/machinery/shower
name = "shower"
desc = "The HS-451. Installed in the 2550s by the Nanotrasen Hygiene Division."