mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] end of file Fix (#10355)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
2af001e7e5
commit
65f21fb1d3
@@ -13,7 +13,7 @@
|
||||
continue
|
||||
if(emote.key in keys)
|
||||
if(!duplicates[emote.key])
|
||||
duplicates[emote.key] = list()
|
||||
duplicates[emote.key] = list()
|
||||
duplicates[emote.key] += etype
|
||||
else
|
||||
keys += emote.key
|
||||
|
||||
@@ -171,4 +171,4 @@
|
||||
name = "Arithmetic Circuits: Modulo - 2"
|
||||
circuit_type = /obj/item/integrated_circuit/arithmetic/modulo
|
||||
inputs_to_give = list(20, 5)
|
||||
expected_outputs = list(0)
|
||||
expected_outputs = list(0)
|
||||
|
||||
@@ -70,4 +70,3 @@
|
||||
else
|
||||
pass("[name] matched all expected outputs.")
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -48,4 +48,4 @@
|
||||
name = "Converter Circuits: Degrees2Radians"
|
||||
circuit_type = /obj/item/integrated_circuit/converter/degrees2radians
|
||||
inputs_to_give = list(90)
|
||||
expected_outputs = list(1) // 1.570796
|
||||
expected_outputs = list(1) // 1.570796
|
||||
|
||||
@@ -52,4 +52,4 @@
|
||||
else
|
||||
pass("All integrated circuit prefabs are within complexity and size limits.")
|
||||
|
||||
return 1
|
||||
return 1
|
||||
|
||||
@@ -30,4 +30,4 @@
|
||||
name = "Trig Circuits: Tangent - 1"
|
||||
circuit_type = /obj/item/integrated_circuit/trig/tangent
|
||||
inputs_to_give = list(45)
|
||||
expected_outputs = list(1)
|
||||
expected_outputs = list(1)
|
||||
|
||||
@@ -26,4 +26,4 @@
|
||||
fail("Some keys are used by more than one language:\n" + key_conflict_log.Join("\n"))
|
||||
else
|
||||
pass("All languages in GLOB.all_languages have distinct keys")
|
||||
return 1
|
||||
return 1
|
||||
|
||||
@@ -43,4 +43,4 @@
|
||||
else
|
||||
pass("All atoms were initialized")
|
||||
return 1
|
||||
*/
|
||||
*/
|
||||
|
||||
@@ -26,20 +26,20 @@
|
||||
if(!pred.vore_selected)
|
||||
fail("[pred] has no vore_selected.")
|
||||
return 1
|
||||
|
||||
|
||||
// Attempt to eat the prey
|
||||
if(prey.loc != pred.vore_selected)
|
||||
pred.vore_selected.nom_mob(prey)
|
||||
|
||||
|
||||
if(prey.loc != pred.vore_selected)
|
||||
fail("[pred.vore_selected].nom_mob([prey]) did not put prey inside [pred]")
|
||||
return 1
|
||||
|
||||
|
||||
// Okay, we succeeded in eating them, now lets wait a bit
|
||||
startLifeTick = pred.life_tick
|
||||
startOxyloss = prey.getOxyLoss()
|
||||
return 0
|
||||
|
||||
|
||||
if(pred.life_tick < (startLifeTick + 10))
|
||||
return 0 // Wait for them to breathe a few times
|
||||
|
||||
@@ -82,11 +82,11 @@
|
||||
if(!pred.vore_selected)
|
||||
fail("[pred] has no vore_selected.")
|
||||
return 1
|
||||
|
||||
|
||||
// Attempt to eat the prey
|
||||
if(prey.loc != pred.vore_selected)
|
||||
pred.vore_selected.nom_mob(prey)
|
||||
|
||||
|
||||
if(prey.loc != pred.vore_selected)
|
||||
fail("[pred.vore_selected].nom_mob([prey]) did not put prey inside [pred]")
|
||||
return 1
|
||||
@@ -113,7 +113,7 @@
|
||||
startLifeTick = pred.life_tick
|
||||
startOxyloss = prey.getOxyLoss()
|
||||
return 0
|
||||
|
||||
|
||||
if(pred.life_tick < (startLifeTick + 10))
|
||||
return 0 // Wait for them to breathe a few times
|
||||
|
||||
@@ -156,21 +156,21 @@
|
||||
if(!pred.vore_selected)
|
||||
fail("[pred] has no vore_selected.")
|
||||
return 1
|
||||
|
||||
|
||||
// Attempt to eat the prey
|
||||
if(prey.loc != pred.vore_selected)
|
||||
pred.vore_selected.nom_mob(prey)
|
||||
|
||||
|
||||
if(prey.loc != pred.vore_selected)
|
||||
fail("[pred.vore_selected].nom_mob([prey]) did not put prey inside [pred]")
|
||||
return 1
|
||||
|
||||
|
||||
// Okay, we succeeded in eating them, now lets wait a bit
|
||||
pred.vore_selected.digest_mode = DM_DIGEST
|
||||
startLifeTick = pred.life_tick
|
||||
startBruteBurn = prey.getBruteLoss() + prey.getFireLoss()
|
||||
return 0
|
||||
|
||||
|
||||
if(pred.life_tick < (startLifeTick + 10))
|
||||
return 0 // Wait a few ticks for damage to happen
|
||||
|
||||
|
||||
Reference in New Issue
Block a user