cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-20 04:34:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #570 from MisterGrimm/Moronfixing

Browse Source 
Fixing the work of a moron.
This commit is contained in:
Razgriz
2020-10-06 17:16:35 -06:00
committed by GitHub
parent ef5f28cb0c 025397c417
commit f932863bb2
6 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/maps/tg/map_template.dm
+3 -3
View File
@@ -9,9 +9,9 @@
var/annihilate = FALSE // If true, all (movable) atoms at the location where the map is loaded will be deleted before the map is loaded in.
var/fixed_orientation = FALSE // If true, the submap will not be rotated randomly when loaded.
var/cost = null // The map generator has a set 'budget' it spends to place down different submaps. It will pick available submaps randomly until \
it runs out. The cost of a submap should roughly corrispond with several factors such as size, loot, difficulty, desired scarcity, etc. \
Set to -1 to force the submap to always be made.
var/cost = null /*The map generator has a set 'budget' it spends to place down different submaps. It will pick available submaps randomly until
it runs out. The cost of a submap should roughly corrispond with several factors such as size, loot, difficulty, desired scarcity, etc.
Set to -1 to force the submap to always be made. */
var/allow_duplicates = FALSE // If false, only one map template will be spawned by the game. Doesn't affect admins spawning then manually.
var/discard_prob = 0 // If non-zero, there is a chance that the map seeding algorithm will skip this template when selecting potential templates to use.
code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm
+3 -3
View File
@@ -88,9 +88,9 @@
hitsound_wall = 'sound/weapons/effects/searwall.ogg'
// Close to mid-ranged shooter that arcs over other things, ideal if allies are in front of it.
// Difference from siege hivebots is that siege hivebots have limited charges for their attacks, are very long range, and \
// the projectiles have an AoE component, where as backline hivebots do not.
/* Close to mid-ranged shooter that arcs over other things, ideal if allies are in front of it.
Difference from siege hivebots is that siege hivebots have limited charges for their attacks, are very long range, and
the projectiles have an AoE component, where as backline hivebots do not. */
/mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline
name = "backline hivebot"
desc = "A robot that can fire short-ranged projectiles over their allies."
code/modules/surgery/organs_internal.dm
+10 -10
View File
@@ -431,15 +431,15 @@
// HEART SURGERY //
//////////////////////////////////////////////////////////////////
// To be finished after some tests.
// /datum/surgery_step/ribcage/heart/cut
// allowed_tools = list(
// /obj/item/weapon/surgical/scalpel = 100, \
// /obj/item/weapon/material/knife = 75, \
// /obj/item/weapon/material/shard = 50, \
// )
/* /datum/surgery_step/ribcage/heart/cut
allowed_tools = list(
/obj/item/weapon/surgical/scalpel = 100,
/obj/item/weapon/material/knife = 75,
/obj/item/weapon/material/shard = 50,
)
// min_duration = 30
// max_duration = 40
min_duration = 30
max_duration = 40
// /datum/surgery_step/ribcage/heart/cut/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
// return ..() && target.op_stage.ribcage == 2
/datum/surgery_step/ribcage/heart/cut/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
return ..() && target.op_stage.ribcage == 2 */