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

Moved the space suits into the clothing module section, will do more later.

Browse Source 
Forgot to add the bioprotection to the actual radiation suits.
Bedsheets actually use the bedsheet item icon now.
Tracking implant ID's work again.
Certain Critters can be harvested by the chef's knives for meat.
Renamed a few critter files.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2053 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-08-28 07:05:06 +00:00
parent 8722ab0b8e
commit 6c90edd6f6
24 changed files with 518 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/glasses.dm
+19
View File
@@ -0,0 +1,19 @@
/obj/item/clothing/glasses
name = "glasses"
icon = 'glasses.dmi'
w_class = 2.0
flags = GLASSESCOVERSEYES
var
vision_flags = 0
darkness_view = 0//Base human is 2
invisa_view = 0
/*
SEE_SELF // can see self, no matter what
SEE_MOBS // can see all mobs, no matter what
SEE_OBJS // can see all objs, no matter what
SEE_TURFS // can see all turfs (and areas), no matter what
SEE_PIXELS// if an object is located on an unlit area, but some of its pixels are
// in a lit area (via pixel_x,y or smooth movement), can see those pixels
BLIND // can't see anything
*/
code/modules/clothing/glasses/glasses.dm
-19
View File
@@ -1,22 +1,3 @@
/obj/item/clothing/glasses
name = "glasses"
icon = 'glasses.dmi'
w_class = 2.0
flags = GLASSESCOVERSEYES
var
vision_flags = 0
darkness_view = 0//Base human is 2
invisa_view = 0
/*
SEE_SELF // can see self, no matter what
SEE_MOBS // can see all mobs, no matter what
SEE_OBJS // can see all objs, no matter what
SEE_TURFS // can see all turfs (and areas), no matter what
SEE_PIXELS// if an object is located on an unlit area, but some of its pixels are
// in a lit area (via pixel_x,y or smooth movement), can see those pixels
BLIND // can't see anything
*/
/obj/item/clothing/glasses/blindfold
code/modules/clothing/spacesuits.dm
+35
View File
@@ -0,0 +1,35 @@
/*Contains
Space suit parts
/helmet/space*
/suit/space*
*/
/obj/item/clothing/head/helmet/space
name = "Space helmet"
icon_state = "space"
desc = "A special helmet designed for work in a hazardous, low-pressure environment."
flags = FPRINT | TABLEPASS | HEADSPACE | HEADCOVERSEYES | HEADCOVERSMOUTH
see_face = 0.0
item_state = "space"
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 25, rad = 25)
/obj/item/clothing/suit/space
name = "Space suit"
desc = "A suit that protects against low pressure environments. Has a big 13 on the back."
icon_state = "space"
item_state = "s_suit"
w_class = 4//bulky item
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02
heat_transfer_coefficient = 0.02
radiation_protection = 0.25
protective_temperature = 1000
flags = FPRINT | TABLEPASS | SUITSPACE
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen)
slowdown = 3
armor = list(melee = 20, bullet = 5, laser = 10, taser = 3, bomb = 15, bio = 30, rad = 40)
code/modules/clothing/spacesuits/miscellaneous.dm
+62
View File
@@ -0,0 +1,62 @@
/obj/item/clothing/head/helmet/space/capspace
name = "space helmet"
icon_state = "capspace"
desc = "A special helmet designed for work in a hazardous, low-pressure environment. Only for the most fashionable of military figureheads."
flags = FPRINT | TABLEPASS | HEADSPACE | HEADCOVERSEYES
see_face = 0.0
item_state = "capspace"
permeability_coefficient = 0.01
armor = list(melee = 60, bullet = 50, laser = 50, taser = 25, bomb = 50, bio = 20, rad = 20)
/obj/item/clothing/head/helmet/space/deathsquad
name = "deathsquad helmet"
desc = "That's not red paint. That's real blood."
icon_state = "deathsquad"
item_state = "deathsquad"
armor = list(melee = 65, bullet = 55, laser = 35, taser = 20, bomb = 30, bio = 30, rad = 30)
/obj/item/clothing/head/helmet/space/deathsquad/beret
name = "officer's beret"
desc = "An armored beret commonly used by special operations officers."
icon_state = "beret_badge"
armor = list(melee = 65, bullet = 55, laser = 35, taser = 20, bomb = 30, bio = 30, rad = 30)
/obj/item/clothing/head/helmet/space/santahat
name = "Santa's hat"
desc = "Ho ho ho. Merrry X-mas!"
icon_state = "santahat"
/obj/item/clothing/suit/space/santa
name = "Santa's suit"
desc = "Festive!"
icon_state = "santa"
item_state = "santa"
slowdown = 1
flags = FPRINT | TABLEPASS | ONESIZEFITSALL | SUITSPACE
/obj/item/clothing/head/helmet/space/pirate
name = "pirate hat"
desc = "Yarr."
icon_state = "pirate"
item_state = "pirate"
armor = list(melee = 60, bullet = 50, laser = 30, taser = 15, bomb = 30, bio = 30, rad = 30)
/obj/item/clothing/suit/space/pirate
name = "pirate coat"
desc = "Yarr."
icon_state = "pirate"
item_state = "pirate"
w_class = 3
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
slowdown = 0
armor = list(melee = 60, bullet = 50, laser = 30, taser = 15, bomb = 30, bio = 30, rad = 30)
code/modules/clothing/spacesuits/ninja.dm
+63
View File
@@ -0,0 +1,63 @@
/obj/item/clothing/head/helmet/space/space_ninja
desc = "What may appear to be a simple black garment is in fact a highly sophisticated nano-weave helmet. Standard issue ninja gear."
name = "ninja hood"
icon_state = "s-ninja"
item_state = "s-ninja_mask"
radiation_protection = 0.25
see_face = 1
allowed = list(/obj/item/weapon/cell)
armor = list(melee = 60, bullet = 50, laser = 30, taser = 15, bomb = 30, bio = 30, rad = 30)
/obj/item/clothing/suit/space/space_ninja
name = "ninja suit"
desc = "A unique, vaccum-proof suit of nano-enhanced armor designed specifically for Spider Clan assassins."
icon_state = "s-ninja"
item_state = "s-ninja_suit"
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/cell)
radiation_protection = 0.75
slowdown = 1
armor = list(melee = 60, bullet = 50, laser = 30, taser = 15, bomb = 30, bio = 30, rad = 30)
var
//Important parts of the suit.
mob/living/carbon/affecting = null//The wearer.
obj/item/weapon/cell/cell//Starts out with a high-capacity cell using New().
datum/effects/system/spark_spread/spark_system//To create sparks.
reagent_list[] = list("tricordrazine","dexalinp","spaceacillin","anti_toxin","nutriment","radium","hyronalin")//The reagents ids which are added to the suit at New().
stored_research[]//For stealing station research.
obj/item/weapon/disk/tech_disk/t_disk//To copy design onto disk.
//Other articles of ninja gear worn together, used to easily reference them after initializing.
obj/item/clothing/head/helmet/space/space_ninja/n_hood
obj/item/clothing/shoes/space_ninja/n_shoes
obj/item/clothing/gloves/space_ninja/n_gloves
//Main function variables.
s_initialized = 0//Suit starts off.
s_coold = 0//If the suit is on cooldown. Can be used to attach different cooldowns to abilities. Ticks down every second based on suit ntick().
s_cost = 5.0//Base energy cost each ntick.
s_acost = 25.0//Additional cost for additional powers active.
k_cost = 200.0//Kamikaze energy cost each ntick.
k_damage = 1.0//Brute damage potentially done by Kamikaze each ntick.
s_delay = 40.0//How fast the suit does certain things, lower is faster. Can be overridden in specific procs. Also determines adverse probability.
a_transfer = 20.0//How much reagent is transferred when injecting.
r_maxamount = 80.0//How much reagent in total there is.
//Support function variables.
spideros = 0//Mode of SpiderOS. This can change so I won't bother listing the modes here (0 is hub). Check ninja_equipment.dm for how it all works.
s_active = 0//Stealth off.
s_busy = 0//Is the suit busy with a process? Like AI hacking. Used for safety functions.
kamikaze = 0//Kamikaze on or off.
k_unlock = 0//To unlock Kamikaze.
//Ability function variables.
s_bombs = 10.0//Number of starting ninja smoke bombs.
a_boost = 3.0//Number of adrenaline boosters.
//Onboard AI related variables.
mob/living/silicon/ai/AI//If there is an AI inside the suit.
obj/item/device/paicard/pai//A slot for a pAI device
obj/overlay/hologram//Is the AI hologram on or off? Visible only to the wearer of the suit. This works by attaching an image to a blank overlay.
flush = 0//If an AI purge is in progress.
s_control = 1//If user in control of the suit.
code/modules/clothing/spacesuits/rig.dm
+25
View File
@@ -0,0 +1,25 @@
/obj/item/clothing/head/helmet/space/rig
name = "Rig helmet"
desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
icon_state = "rig-engineering"
item_state = "rig_helm"
armor = list(melee = 40, bullet = 5, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50)
allowed = list(/obj/item/device/flashlight)
/obj/item/clothing/head/helmet/space/rig/mining
icon_state = "rig-mining"
item_state = "rig_helm"
/obj/item/clothing/suit/space/rig
name = "Rig suit"
desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
icon_state = "rig-engineering"
item_state = "rig_suit"
radiation_protection = 0.50
slowdown = 2
armor = list(melee = 40, bullet = 5, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/satchel,/obj/item/device/t_scanner)
/obj/item/clothing/suit/space/rig/mining
icon_state = "rig-mining"
item_state = "rig_suit"
code/modules/clothing/spacesuits/syndi.dm
+201
View File
@@ -0,0 +1,201 @@
/obj/item/clothing/head/helmet/space/syndicate
name = "red space helmet"
desc = "Top secret Spess Helmet."
icon_state = "syndicate"
item_state = "syndicate"
desc = "Has a tag: Totally not property of an enemy corporation, honest."
armor = list(melee = 60, bullet = 50, laser = 30, taser = 15, bomb = 30, bio = 30, rad = 30)
/obj/item/clothing/suit/space/syndicate
name = "red space suit"
icon_state = "syndicate"
item_state = "space_suit_syndicate"
desc = "Has a tag on it: Totally not property of of a hostile corporation, honest!"
w_class = 3
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
slowdown = 1
armor = list(melee = 60, bullet = 50, laser = 30, taser = 15, bomb = 30, bio = 30, rad = 30)
/obj/item/clothing/head/helmet/space/syndicate/green
name = "Green Space Helmet"
icon_state = "syndicate-helm-green"
item_state = "syndicate-helm-green"
/obj/item/clothing/suit/space/syndicate/green
name = "Green Space Suit"
icon_state = "syndicate-green"
item_state = "syndicate-green"
/obj/item/clothing/head/helmet/space/syndicate/green/dark
name = "Dark Green Space Helmet"
icon_state = "syndicate-helm-green-dark"
item_state = "syndicate-helm-green-dark"
/obj/item/clothing/suit/space/syndicate/green/dark
name = "Dark Green Space Suit"
icon_state = "syndicate-green-dark"
item_state = "syndicate-green-dark"
/obj/item/clothing/head/helmet/space/syndicate/orange
name = "Orange Space Helmet"
icon_state = "syndicate-helm-orange"
item_state = "syndicate-helm-orange"
/obj/item/clothing/suit/space/syndicate/orange
name = "Orange Space Suit"
icon_state = "syndicate-orange"
item_state = "syndicate-orange"
/obj/item/clothing/head/helmet/space/syndicate/blue
name = "Blue Space Helmet"
icon_state = "syndicate-helm-blue"
item_state = "syndicate-helm-blue"
/obj/item/clothing/suit/space/syndicate/blue
name = "Blue Space Suit"
icon_state = "syndicate-blue"
item_state = "syndicate-blue"
/obj/item/clothing/head/helmet/space/syndicate/black
name = "Black Space Helmet"
icon_state = "syndicate-helm-black"
item_state = "syndicate-helm-black"
/obj/item/clothing/suit/space/syndicate/black
name = "Black Space Suit"
icon_state = "syndicate-black"
item_state = "syndicate-black"
/obj/item/clothing/head/helmet/space/syndicate/black/green
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-green"
item_state = "syndicate-helm-black-green"
/obj/item/clothing/suit/space/syndicate/black/green
name = "Black and Green Space Suit"
icon_state = "syndicate-black-green"
item_state = "syndicate-black-green"
/obj/item/clothing/head/helmet/space/syndicate/black/blue
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-blue"
item_state = "syndicate-helm-black-blue"
/obj/item/clothing/suit/space/syndicate/black/blue
name = "Black and Blue Space Suit"
icon_state = "syndicate-black-blue"
item_state = "syndicate-black-blue"
/obj/item/clothing/head/helmet/space/syndicate/black/med
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-med"
item_state = "syndicate-helm-black"
/obj/item/clothing/suit/space/syndicate/black/med
name = "Green Space Suit"
icon_state = "syndicate-black-med"
item_state = "syndicate-black"
/obj/item/clothing/head/helmet/space/syndicate/black/orange
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-orange"
item_state = "syndicate-helm-black"
/obj/item/clothing/suit/space/syndicate/black/orange
name = "Black and Orange Space Suit"
icon_state = "syndicate-black-orange"
item_state = "syndicate-black"
/obj/item/clothing/head/helmet/space/syndicate/black/red
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-red"
item_state = "syndicate-helm-black-red"
/obj/item/clothing/suit/space/syndicate/black/red
name = "Black and Red Space Suit"
icon_state = "syndicate-black-red"
item_state = "syndicate-black-red"
/obj/item/clothing/head/helmet/space/syndicate/black/engie
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-engie"
item_state = "syndicate-helm-black"
/obj/item/clothing/suit/space/syndicate/black/engie
name = "Black Engineering Space Suit"
icon_state = "syndicate-black-engie"
item_state = "syndicate-black"
/obj/item/clothing/head/helmet/space/syndicate/elite
name = "black space helmet"
desc = "Professionals Have Standards, Be Polite, Be Efficient, Have a plan to kill everyone you meet."
icon_state = "syndicate-helm-black"
item_state = "syndicate-helm-black"
armor = list(melee = 65, bullet = 55, laser = 35, taser = 20, bomb = 30, bio = 30, rad = 30)
/obj/item/clothing/suit/space/syndicate/elite
name = "black space suit"
desc = "A space ready suit with special armor inside designed to allow the wearer to take quite a beating."
icon_state = "syndicate-black"
item_state = "syndicate-black"
slowdown = 1
armor = list(melee = 80, bullet = 60, laser = 50, taser = 25, bomb = 50, bio = 10, rad = 0)
/obj/item/clothing/head/helmet/space/syndicate/elite/leader
name = "black space helmet"
icon_state = "syndicate-helm-black-red"
item_state = "syndicate-helm-black-red"
/obj/item/clothing/suit/space/syndicate/elite/leader
name = "black space suit"
icon_state = "syndicate-black-red"
item_state = "syndicate-black-red"
code/modules/clothing/spacesuits/void.dm
+14
View File
@@ -0,0 +1,14 @@
/obj/item/clothing/head/helmet/space/nasavoid
name = "NASA Void Helmet"
desc = "A high tech, NASA Centcom branch designed, dark red space suit helmet. Used for AI satellite maintenance."
icon_state = "void"
item_state = "void"
see_face = 1
/obj/item/clothing/suit/space/nasavoid
name = "NASA Voidsuit"
icon_state = "void"
item_state = "void"
desc = "A high tech, NASA Centcom branch designed, dark red Space suit. Used for AI satellite maintenance."
slowdown = 1.5
code/modules/critters/adefine.dm → code/modules/critters/critter.dm
+1
View File
@@ -70,6 +70,7 @@
RunAttack()
TakeDamage(var/damage = 0)
Target_Attacker(var/target)
Harvest(var/obj/item/weapon/W, var/mob/living/user)//Controls havesting things from dead critters
code/modules/critters/critterAI.dm → code/modules/critters/critter_AI.dm
View File
code/modules/critters/defenses.dm → code/modules/critters/critter_defenses.dm
+10 -2
View File
@@ -5,7 +5,9 @@ Contains the procs that control attacking critters
attackby(obj/item/weapon/W as obj, mob/living/user as mob)
..()
if (!src.alive) return
if(!src.alive)
Harvest(W,user)
return
var/damage = 0
switch(W.damtype)
if("fire") damage = W.force * firevuln
@@ -48,7 +50,7 @@ Contains the procs that control attacking critters
src.Die()
Die()//Might be more effective to del them and create a dummy item of some sorts
Die()
if (!src.alive) return
src.icon_state += "-dead"
src.alive = 0
@@ -58,6 +60,12 @@ Contains the procs that control attacking critters
src.visible_message("<b>[src]</b> dies!")
Harvest(var/obj/item/weapon/W, var/mob/living/user)
if((!W) || (!user)) return 0
if(src.alive) return 0
return 1
bullet_act(var/obj/item/projectile/Proj)
TakeDamage(Proj.damage)
code/modules/critters/critters.dm
+60 -18
View File
@@ -39,6 +39,7 @@
..()
del(src)
/obj/critter/killertomato
name = "killer tomato"
desc = "Oh shit, you're really fucked now."
@@ -53,12 +54,24 @@
firevuln = 2
brutevuln = 2
Die()
..()
new /obj/item/weapon/reagent_containers/food/snacks/tomatomeat(src)
if(prob(50))
new /obj/item/weapon/reagent_containers/food/snacks/tomatomeat(src)
new /obj/item/weapon/reagent_containers/food/snacks/tomatomeat(src)
Harvest(var/obj/item/weapon/W, var/mob/living/user)
if(..())
var/success = 0
if(istype(W, /obj/item/weapon/butch))
new /obj/item/weapon/reagent_containers/food/snacks/tomatomeat(src)
success = 1
if(istype(W, /obj/item/weapon/kitchenknife))
new /obj/item/weapon/reagent_containers/food/snacks/tomatomeat(src)
new /obj/item/weapon/reagent_containers/food/snacks/tomatomeat(src)
success = 1
if(success)
for(var/mob/O in viewers(src, null))
O.show_message("\red [user.name] cuts apart the [src.name]!", 1)
del(src)
return 1
return 0
/obj/critter/spore
@@ -76,6 +89,7 @@
firevuln = 2
brutevuln = 2
Die()
src.visible_message("<b>[src]</b> ruptures and explodes!")
src.alive = 0
@@ -85,10 +99,12 @@
explosion(T, -1, -1, 2, 3)
del src
ex_act(severity)
src.Die()
/obj/critter/spesscarp
name = "Spess Carp"
desc = "Oh shit, you're really fucked now."
@@ -109,12 +125,24 @@
angertext = "swims at"
attacktext = "bites"
Die()
..()
new/obj/item/weapon/reagent_containers/food/snacks/carpmeat(src.loc)
if(prob(50))
new /obj/item/weapon/reagent_containers/food/snacks/carpmeat(src)
new /obj/item/weapon/reagent_containers/food/snacks/carpmeat(src)
Harvest(var/obj/item/weapon/W, var/mob/living/user)
if(..())
var/success = 0
if(istype(W, /obj/item/weapon/butch))
new/obj/item/weapon/reagent_containers/food/snacks/carpmeat(src.loc)
new/obj/item/weapon/reagent_containers/food/snacks/carpmeat(src.loc)
success = 1
if(istype(W, /obj/item/weapon/kitchenknife))
new/obj/item/weapon/reagent_containers/food/snacks/carpmeat(src.loc)
success = 1
if(success)
for(var/mob/O in viewers(src, null))
O.show_message("\red [user.name] cuts apart the [src.name]!", 1)
del(src)
return 1
return 0
/obj/critter/spesscarp/elite
@@ -125,6 +153,8 @@
melee_damage_upper = 20
// opensdoors = 1 would give all access dono if want
/obj/critter/walkingmushroom
name = "Walking Mushroom"
desc = "A...huge...mushroom...with legs!?"
@@ -139,12 +169,24 @@
firevuln = 2
brutevuln = 1
Die()
..()
new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
if(prob(50))
new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
Harvest(var/obj/item/weapon/W, var/mob/living/user)
if(..())
var/success = 0
if(istype(W, /obj/item/weapon/butch))
new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
success = 1
if(istype(W, /obj/item/weapon/kitchenknife))
new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
success = 1
if(success)
for(var/mob/O in viewers(src, null))
O.show_message("\red [user.name] cuts apart the [src.name]!", 1)
del(src)
return 1
return 0
/obj/critter/lizard