cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Travis, reverts non-spanclass change

Browse Source
This commit is contained in:
GinjaNinja32
2015-06-05 00:58:13 +01:00
parent 63ea8338fb
commit 28a1bad9c4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@@ -24,6 +24,7 @@ script:
- shopt -s globstar - shopt -s globstar
- (! grep 'step_[xy]' maps/**/*.dmm) - (! grep 'step_[xy]' maps/**/*.dmm)
- (! find nano/templates/ -type f -exec md5sum {} + | sort | uniq -D -w 32 | grep nano) - (! find nano/templates/ -type f -exec md5sum {} + | sort | uniq -D -w 32 | grep nano)
- (num=`grep -E '\\\\(red|blue|green|black|b|i[^mc])' **/*.dm | wc -l`; [ $num -le 1355 ])
- ( md5sum -c - <<< "0af969f671fba6cf9696c78cd175a14a *baystation12.int") - ( md5sum -c - <<< "0af969f671fba6cf9696c78cd175a14a *baystation12.int")
- DreamMaker baystation12.dme - DreamMaker baystation12.dme
- python tools/GenerateChangelog/ss13_genchangelog.py html/changelog.html html/changelogs - python tools/GenerateChangelog/ss13_genchangelog.py html/changelog.html html/changelogs

7
code/game/objects/items/weapons/storage/briefcase.dm
View File

@@ -31,10 +31,9 @@
if (M.stat < 2 && M.health < 50 && prob(90)) if (M.stat < 2 && M.health < 50 && prob(90))
var/mob/H = M var/mob/H = M
// ******* Check // ******* Check
// Commented this bit out simply because it doesn't make sense, I can't work out what it's supposed to do, and it doesn't do anything at all as it is ~GN if ((istype(H, /mob/living/carbon/human) && istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80)))
// if ((istype(H, /mob/living/carbon/human) && istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80))) M << "<span class='warning'>The helmet protects you from being hit hard in the head!</span>"
// M << "<span class='warning'>The helmet protects you from being hit hard in the head!</span>" return
// return
var/time = rand(2, 6) var/time = rand(2, 6)
if (prob(75)) if (prob(75))
M.Paralyse(time) M.Paralyse(time)