cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

All Syndicate items have updated tech levels.

Browse Source 
New Head of Staff PDAs and PDA cartridges.
Fixed the bug where laser guns could fire stun rounds.
Added the cyborg upload circuitboard to the RD console and Secure Tech Storage. Forgot to do that in r1748. Whoops.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1751 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
Superxpdude@gmail.com
2011-07-01 20:58:12 +00:00
parent e58e2ad3ba
commit 81f43b1929
15 changed files with 108 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/devices/PDA/PDA.dm
+20
View File
@@ -76,6 +76,26 @@
default_cartridge = /obj/item/weapon/cartridge/head
icon_state = "pda-h"
/obj/item/device/pda/heads/hop
default_cartridge = /obj/item/weapon/cartridge/hop
icon_state = "pda-hop"
/obj/item/device/pda/heads/hos
default_cartridge = /obj/item/weapon/cartridge/hos
icon_state = "pda-hos"
/obj/item/device/pda/heads/ce
default_cartridge = /obj/item/weapon/cartridge/ce
icon_state = "pda-ce"
/obj/item/device/pda/heads/cmo
default_cartridge = /obj/item/weapon/cartridge/cmo
icon_state = "pda-cmo"
/obj/item/device/pda/heads/rd
default_cartridge = /obj/item/weapon/cartridge/rd
icon_state = "pda-rd"
/obj/item/device/pda/captain
default_cartridge = /obj/item/weapon/cartridge/captain
icon_state = "pda-c"
code/game/objects/devices/PDA/cart.dm
+50 -2
View File
@@ -98,10 +98,58 @@
name = "Easy-Record DELUXE"
icon_state = "cart-h"
access_manifest = 1
access_engine = 1
access_security = 1
access_status_display = 1
hop
name = "HumanResources9001"
icon_state = "cart-h"
access_manifest = 1
access_status_display = 1
access_quartermaster = 1
New()
..()
spawn(5)
radio = new /obj/item/radio/integrated/mule(src)
hos
name = "R.O.B.U.S.T. DELUXE"
icon_state = "cart-hos"
access_manifest = 1
access_status_display = 1
access_security = 1
New()
..()
spawn(5)
radio = new /obj/item/radio/integrated/beepsky(src)
ce
name = "Power-On DELUXE"
icon_state = "cart-ce"
access_manifest = 1
access_status_display = 1
access_engine = 1
cmo
name = "Med-U DELUXE"
icon_state = "cart-cmo"
access_manifest = 1
access_status_display = 1
access_medical = 1
rd
name = "Signal Ace DELUXE"
icon_state = "cart-rd"
access_manifest = 1
access_status_display = 1
access_reagent_scanner = 1
New()
..()
spawn(5)
radio = new /obj/item/radio/integrated/signal(src)
captain
name = "Value-PAK Cartridge"
desc = "Now with 200% more value!"
code/game/objects/devices/chameleonproj.dm
+1 -1
View File
@@ -37,7 +37,7 @@
throw_speed = 1
throw_range = 5
w_class = 2.0
origin_tech = "syndicate=2;magnets=4"
origin_tech = "syndicate=4;magnets=4"
var/can_use = 1
var/obj/dummy/chameleon/active_dummy = null
var/saved_item = "/obj/item/weapon/shard"
code/game/objects/devices/powersink.dm
+1 -1
View File
@@ -12,7 +12,7 @@
throw_range = 2
m_amt = 750
w_amt = 750
origin_tech = "powerstorage=3;syndicate=3"
origin_tech = "powerstorage=3;syndicate=5"
var/drain_rate = 600000 // amount of power to drain per tick
var/power_drained = 0 // has drained this much power
var/max_power = 1e8 // maximum power that can be drained before exploding
code/game/objects/items.dm
+1 -1
View File
@@ -150,7 +150,7 @@
return
/obj/item/weapon/pen/sleepypen
origin_tech = "syndicate=1"
origin_tech = "syndicate=5"
/obj/item/weapon/pen/sleepypen/attack_paw(mob/user as mob)
return src.attack_hand(user)
code/game/objects/items/weapons/AI_modules.dm
+1 -1
View File
@@ -453,7 +453,7 @@ AI MODULES
name = "Hacked AI Module"
var/newFreeFormLaw = "freeform"
desc = "A hacked AI law module: '<freeform>'"
origin_tech = "programming=3;materials=6;syndicate=3"
origin_tech = "programming=3;materials=6;syndicate=7"
/obj/item/weapon/aiModule/syndicate/attack_hand(var/mob/user as mob)
..()
code/game/objects/items/weapons/guns_new.dm
+11 -3
View File
@@ -244,7 +244,7 @@ var/const/PROJECTILE_DART = 8
name = "revolver"
icon_state = "revolver"
caliber = "357"
origin_tech = "combat=2;materials=2"
origin_tech = "combat=2;materials=2;syndicate=6"
w_class = 3.0
throw_speed = 2
throw_range = 10
@@ -306,6 +306,7 @@ var/const/PROJECTILE_DART = 8
icon_state = "detective"
force = 14.0
caliber = "38"
origin_tech = "combat=2;materials=2"
New()
for(var/i = 1, i <= max_shells, i++)
@@ -341,6 +342,7 @@ var/const/PROJECTILE_DART = 8
name = "mateba"
desc = "When you absolutely, positively need a 10mm hole in the other guy. Uses .357 ammo."
icon_state = "mateba"
origin_tech = "combat=2;materials=2"
shotgun
name = "shotgun"
@@ -349,7 +351,9 @@ var/const/PROJECTILE_DART = 8
max_shells = 2
w_class = 4.0
force = 7.0
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY | ONBACK
caliber = "shotgun"
origin_tech = "combat=2;materials=2"
New()
for(var/i = 1, i <= max_shells, i++)
@@ -425,6 +429,10 @@ var/const/PROJECTILE_DART = 8
force = 7.0
m_amt = 2000
origin_tech = "combat=3;magnets=2"
mode = 1 //We don't want laser guns to be on a stun setting. --Superxpdude
attack_self(mob/living/user as mob)
return // We don't want laser guns to be able to change to a stun setting. --Superxpdude
captain
icon_state = "caplaser"
@@ -485,7 +493,7 @@ var/const/PROJECTILE_DART = 8
destroyer
name = "pulse destroyer"
desc = "A heavy-duty, pulse-based energy weapon. The mode is set to DESRTOY. Always destroy."
desc = "A heavy-duty, pulse-based energy weapon. The mode is set to DESTROY. Always destroy."
mode = 2
New()
power_supply = new /obj/item/weapon/cell/infinite(src)
@@ -612,7 +620,7 @@ var/const/PROJECTILE_DART = 8
throw_speed = 2
throw_range = 10
m_amt = 2000
origin_tech = "combat=2;magnets=2;syndicate=2"
origin_tech = "combat=2;magnets=2;syndicate=5"
silenced = 1
fire_sound = 'Genhit.ogg'