cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Summon Guns spawning broken eguns. Replaced the decloner and freezegun with aegun and mateba (for list of possible guns).

Browse Source 
Added Ausops gateway sprite.

Added placeholder structures so the people working on the map have something to mark where the recieving gate will be.

And unfinished Behemoth code because the dme needed to be updated to include Ausops stuff.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3572 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
kortgstation@gmail.com
2012-05-10 05:33:01 +00:00
parent 15bf7ea10a
commit d15ce2c40d
6 changed files with 183 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/wizard/rightandwrong.dm
+6 -6
View File
@@ -19,20 +19,20 @@
for(var/datum/objective/OBJ in H.mind.objectives)
H << "<B>Objective #[obj_count]</B>: [OBJ.explanation_text]"
obj_count++
var/randomize = pick("taser","egun","laser","revolver","smg","decloner","deagle","gyrojet","pulse","silenced","cannon","shotgun","freeze","uzi","crossbow")
var/randomize = pick("taser","egun","laser","revolver","smg","nuclear","deagle","gyrojet","pulse","silenced","cannon","shotgun","mateba","uzi","crossbow")
switch (randomize)
if("taser")
new /obj/item/weapon/gun/energy/taser(get_turf(H))
if("egun")
new /obj/item/weapon/gun/energy(get_turf(H))
new /obj/item/weapon/gun/energy/gun(get_turf(H))
if("laser")
new /obj/item/weapon/gun/energy/laser(get_turf(H))
if("revolver")
new /obj/item/weapon/gun/projectile(get_turf(H))
if("smg")
new /obj/item/weapon/gun/projectile/automatic/c20r(get_turf(H))
if("decloner")
new /obj/item/weapon/gun/energy/decloner(get_turf(H))
if("nuclear")
new /obj/item/weapon/gun/energy/gun/nuclear(get_turf(H))
if("deagle")
new /obj/item/weapon/gun/projectile/deagle/camo(get_turf(H))
if("gyrojet")
@@ -45,8 +45,8 @@
new /obj/item/weapon/gun/energy/lasercannon(get_turf(H))
if("shotgun")
new /obj/item/weapon/gun/projectile/shotgun/pump/combat(get_turf(H))
if("freeze")
new /obj/item/weapon/gun/energy/temperature(get_turf(H))
if("mateba")
new /obj/item/weapon/gun/projectile/mateba(get_turf(H))
if("uzi")
new /obj/item/weapon/gun/projectile/automatic/mini_uzi(get_turf(H))
if("crossbow")
code/game/machinery/gateway.dm
+49
View File
@@ -0,0 +1,49 @@
/obj/structure/gatewayplaceholder
density = 1
anchored = 1
icon = 'gateway.dmi'
/obj/structure/gatewayplaceholder/one
name = "Gateway"
desc = "A gateway"
icon_state = "off1"
/obj/structure/gatewayplaceholder/two
name = "Gateway"
desc = "A gateway"
icon_state = "off2"
/obj/structure/gatewayplaceholder/three
name = "Gateway"
desc = "A gateway"
icon_state = "off3"
/obj/structure/gatewayplaceholder/four
name = "Gateway"
desc = "A gateway"
icon_state = "off4"
/obj/structure/gatewayplaceholder/five
name = "Gateway"
desc = "A gateway"
icon_state = "off5"
/obj/structure/gatewayplaceholder/six
name = "Gateway"
desc = "A gateway"
icon_state = "off6"
/obj/structure/gatewayplaceholder/seven
name = "Gateway"
desc = "A gateway"
icon_state = "off7"
/obj/structure/gatewayplaceholder/eight
name = "Gateway"
desc = "A gateway"
icon_state = "off8"
/obj/structure/gatewayplaceholder/nine
name = "Gateway"
desc = "A gateway"
icon_state = "off9"