cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Mecha refactor 2020 (#579)

Browse Source 
* Mecha refactor 2020

* Update effects.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
This commit is contained in:
SkyratBot
2020-09-02 02:16:51 +02:00
committed by GitHub
co-authored by TiviPlus Azarak
parent 2d915ac2e4
commit cd0d700a85
94 changed files with 1733 additions and 1871 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/bounties/mech.dm
+7 -7
View File
@@ -5,8 +5,8 @@
/datum/bounty/item/mech/ship(obj/O)
if(!applies_to(O))
return
if(istype(O, /obj/mecha))
var/obj/mecha/M = O
if(istype(O, /obj/vehicle/sealed/mecha))
var/obj/vehicle/sealed/mecha/M = O
M.wreckage = null // So the mech doesn't explode.
..()
@@ -16,24 +16,24 @@
/datum/bounty/item/mech/ripleymkii
name = "APLU MK-II \"Ripley\""
reward = 13000
wanted_types = list(/obj/mecha/working/ripley/mkii)
wanted_types = list(/obj/vehicle/sealed/mecha/working/ripley/mkii)
/datum/bounty/item/mech/clarke
name = "Clarke"
reward = 16000
wanted_types = list(/obj/mecha/working/clarke)
wanted_types = list(/obj/vehicle/sealed/mecha/working/clarke)
/datum/bounty/item/mech/odysseus
name = "Odysseus"
reward = 11000
wanted_types = list(/obj/mecha/medical/odysseus)
wanted_types = list(/obj/vehicle/sealed/mecha/medical/odysseus)
/datum/bounty/item/mech/gygax
name = "Gygax"
reward = 28000
wanted_types = list(/obj/mecha/combat/gygax)
wanted_types = list(/obj/vehicle/sealed/mecha/combat/gygax)
/datum/bounty/item/mech/durand
name = "Durand"
reward = 20000
wanted_types = list(/obj/mecha/combat/durand)
wanted_types = list(/obj/vehicle/sealed/mecha/combat/durand)