cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ripley.dm

Browse Source
This commit is contained in:
Novacat
2020-07-09 20:08:00 -04:00
committed by GitHub
parent e4389f170c
commit f07945ec4e
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/mecha/working/ripley.dm
View File

@@ -81,8 +81,7 @@
qdel (B) qdel (B)
<<<<<<< HEAD //Vorestation Edit Start
// VORESTATION EDIT BEGIN
/obj/mecha/working/ripley/New() /obj/mecha/working/ripley/New()
..() ..()
@@ -96,9 +95,8 @@
orescanner.attack_self(usr) orescanner.attack_self(usr)
// VORESTATION EDIT END //Vorestation Edit End
=======
//Meant for random spawns. //Meant for random spawns.
/obj/mecha/working/ripley/mining/old /obj/mecha/working/ripley/mining/old
desc = "An old, dusty mining ripley." desc = "An old, dusty mining ripley."
@@ -108,4 +106,3 @@
health = 25 health = 25
maxhealth = 190 //Just slightly worse. maxhealth = 190 //Just slightly worse.
cell.charge = rand(0, cell.charge) cell.charge = rand(0, cell.charge)
>>>>>>> 5d10e60... Add a random mech spawner (Not mapped in yet) (#7324)