Commit Graph

5915 Commits

Author SHA1 Message Date
Firecage
2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
pubby
1e4d1ca42f Traitorbro gamemode (#30344)
A dead-simple traitor variant.

It's like traitor, except instead of an uplink you get a buddy: your blood brother. You must team up with your brother to complete your objectives. It runs along side regular traitor mode, thus the name "traitorbro".
2017-09-18 11:02:23 +12:00
MoreRobustThanYou
76706ed0a8 Blobbernauts are healed quicker by cores and nodes (#30527)
* Blobbernauts are healed quicker by cores and nodes

i hate sitting for 3-5 minutes waiting to heal as a naut

* no you can't heal without a factory

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm
2017-09-17 15:50:50 -04:00
Jordan Brown
adc4d49164 Merge pull request #30735 from ShizCalev/numbers
Cleaned up some decimal values.
2017-09-15 16:47:55 -04:00
Leo
aecf3df159 Deletes empty file (#30729)
* Deletes empty file

* Also removes from the DME
2017-09-15 07:06:40 -05:00
YPO
513eba48bd Fixes the doomsday device announcements 2017-09-15 05:14:22 -05:00
KorPhaeron
ed43a09864 Prevents the creation of Shadowzombiechangelings (#30681)
* Prevents the creation of Shadowzombiechangelings

* You can still zombie yourself if you really want

* (
2017-09-15 10:07:03 +02:00
Jordan Brown
513d2c2b19 Merge pull request #30713 from ExcessiveUseOfCobblestone/patch-3
Syndicate Borgs now show up as Syndicate Borgs in Check Antags
2017-09-15 01:15:22 -04:00
shizcalev
4f5658cfbb Cleaned up some decimal values. 2017-09-14 12:50:06 -04:00
Leo
3aaca355a3 Merge pull request #30694 from KorPhaeron/syndie_nuke
Fixes nuking the syndicate base
2017-09-14 13:15:22 -03:00
ExcessiveUseOfCobblestone
6827d97c2d Update antag_spawner.dm 2017-09-13 17:41:26 -04:00
KorPhaeron
8766564d83 Fixes nuking the syndicate base 2017-09-13 11:15:47 -05:00
Mike Long
0eef60e841 Refactors roundstart centcom threat report. (#30241)
* Refactors rounstart centcom threat report.

* Changes a .Add() to a +=

* Fixes merge.

* Another fix from the merge.  Whoops.

* Removes slashes from sandbox report.
2017-09-13 11:45:57 -04:00
vuonojenmustaturska
6e468720ab Fixes to more Initialize procs (#30641)
* batch 1

/mob/living/silicon/robot/syndicate
/obj/effect/decal/cleanable/blood/old
/obj/effect/decal/cleanable/blood/gibs
/obj/effect/decal/cleanable/blood/gibs/old
/obj/effect/decal/cleanable/ash
/obj/effect/decal/cleanable/ash/large
/obj/effect/decal/cleanable/greenglow
/obj/effect/decal/cleanable/vomit/old
/obj/effect/decal/cleanable/shreds
/obj/effect/decal/cleanable/oil
/obj/effect/decal/cleanable/crayon
/obj/effect/decal/cleanable
/obj/effect/temp_visual/point

* batch 2

/obj/effect/anomaly
/mob/living/carbon/monkey/punpun
/obj/item/queen_bee/bought
/mob/living/simple_animal/hostile/poison/bees
/mob/living/carbon/human
/area/ai_monitored
/area

* batch 3

/mob/living/simple_animal/hostile/blob/blobspore
/obj/item/spellbook
/mob/living/simple_animal/hostile/blob/blobbernaut
/mob/camera/blob
/obj/structure/noticeboard
/obj/structure/piano
/obj/item/clothing/head/helmet
/obj/item/gun/energy/laser/chameleon

* batch 4

/obj/machinery/airalarm
/obj/effect/decal/cleanable for reals
/obj/item/stack/rods
/obj/effect/decal/cleanable/crayon for reals
/obj/screen/parallax_layer
/obj/item/device/instrument
/obj/item/ore
/obj/item/coin

* batch 5, getting tgstation ready for halloween

/obj/machinery/meter/turf
/obj/machinery/capture_the_flag
/obj/effect/ctf/dead_barricade
/obj/structure/firepit
/obj/item/clothing/head/helmet/knight
/obj/structure/spacevine
/obj/effect/hallucination/simple/xeno
/obj/effect/hallucination/simple
/mob/living/simple_animal/shade/howling_ghost
/mob/living/simple_animal/hostile/retaliate/clown/insane
/obj/structure/bookcase
/mob/camera/aiEye/remote/base_construction
/obj/machinery/computer/camera_advanced/base_construction
/obj/item/device/wisp_lantern

* batch 6

/obj/item/device/warp_cube/red
/obj/item/device/shared_storage/red
/obj/item/melee/ghost_sword
/mob/living/simple_animal/hostile/mining_drone
/mob/living/brain
/obj/item/device/mmi/posibrain
/mob/living/carbon/human/interactive
/mob/living/carbon/human/interactive/angry
/mob/living/carbon/human/interactive/friendly
/mob/living/carbon/human/interactive/greytide
/mob/living/carbon/human/interactive/robust
/mob/living/carbon/monkey/angry
/mob/living/simple_animal/hostile/guardian/assassin
/mob/living/simple_animal/hostile/syndicate/mecha_pilot/no_mech
/mob/living/simple_animal/hostile/syndicate/mecha_pilot
/mob/living/simple_animal/hostile/mimic/crate
/mob/living/simple_animal/hostile/mimic/copy

* batch 7

/mob/living/simple_animal/hostile/megafauna/colossus
/mob/living/simple_animal/hostile/megafauna/bubblegum
/mob/living/simple_animal/hostile/asteroid/goldgrub
/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck
/mob/living/simple_animal/hostile/asteroid/hivelordbrood
/mob/living/simple_animal/hostile/statue
/mob/living/simple_animal/hostile/wizard
/obj/machinery/power/smes
2017-09-13 02:47:17 -04:00
msgerbs
f844fbb50b Fixed changeling augmented eyesight ability (#30592)
* Fix changeling augmented eyesight

Fix not being able to toggle changeling augmented eyesight off again.

* Fix augmented eyesight

Fix changeling's augmented eyesight ability.

* Fix changeling augmented vision

Fix changeling augmented vision, for real this time. Makes it properly grant night vision on purchase, remove granted effects on refund, and properly toggle on and off. Note, this changes it to x-ray vision, to replicate the way it has been working for well over a year.
2017-09-11 18:37:19 -05:00
KorPhaeron
10a3238fd6 Makes the station Z level into a list instead of a single define (#30297)
* Makes Station Z Levels a global list

* Things didnt get committed

* Define

* Removes files

* Fix mind.dm

* Wrong list name

* (

* Fixes rev checks and signpost

* Makes it actually compile

* Signpost fix

* I hate these sign posts

* Never use the web editor
2017-09-11 13:39:52 -04:00
kingofkosmos
a479714b5f Adds missing span-endings (#30494)
* Adds missing </span>'s.

* ".name]" --> "]" and
"to_chat(GLOB.admins," --> "message_admins("
and one [name] --> [src]

* Earlier commit was a mistake, lesson learned

* Hopefully all is ok now.

* Revert "Hopefully all is ok now."

This reverts commit 3c95e41b4c13ce96469861e9a97453adf4b56826.

* Revert "Earlier commit was a mistake, lesson learned"

This reverts commit d611af1e4a76690453a7f9808b6e2c429b679f6c.

* Revert "".name]" --> "]" and"

This reverts commit d538b9efef2d7d8be9122bf5ceaf105055059bc6.

* message_admins fix
2017-09-11 14:09:53 +02:00
oranges
289587161d Merge pull request #30540 from p440/blobglob
remove GLOB.
2017-09-10 23:46:45 +10:00
oranges
d150085b77 Merge pull request #30524 from ChangelingRain/srcremoval
Removes a src.
2017-09-10 21:00:58 +10:00
some dumbass
6a6708c35d remove GLOB. 2017-09-09 07:48:39 -07:00
Joan Lung
252dc769a6 headshot! 2017-09-08 23:15:17 -04:00
Jordan Brown
64242b4015 Merge pull request #30481 from YPOQ/shuntfix
Placing a robotics factory actually disables shunting
2017-09-08 22:24:40 -04:00
Joan Lung
f22661f2b9 Removes a src. and causes a runtime 2017-09-08 16:18:04 -04:00
kingofkosmos
d4d898f837 Regularizes resisting out of containers (#30412)
* Regularizes resisting out of containers or relaymoving and getting a notification of it.

* Tweaks.

* Transit tube resist while not cuffed added.
2017-09-09 00:57:51 +10:00
ShizCalev
bb1c27d32b Fixes swarmers breaking the SM's containment (#30426)
* Fixes swamers breaking the SM

* Switched checks to use get_area
2017-09-07 12:16:48 +02:00
tortellinitony
224075694b Gets rid of manual overlay manipulation (#30454) 2017-09-06 23:38:24 -05:00
YPO
acee907bef robo factory actually stops shunting 2017-09-06 22:11:20 -06:00
Joan Lung
e83d72219d Soft crit, except not terrible (#30262)
* Soft crit, except a little bit harder.

* tweak

* 👌

* why was this even in here

* no radios in critical

* fix that too

* keep to original logic

* not very smart, really

* tip: do nothing tgui-side that you can do code-side, because we can't do defines in tgui

* blood trail

* can't do blood trails

* how does this even work

* harsher slowdown and more obscured vision

* it really puts it into perspective; you're fucking dying.

* stat_attack

* stop fuckin whispering into radios or whatever it is you're doing

* more fixes

* fix

* fix

* fix the radio shit

* bikeshed?
2017-09-04 18:58:34 -05:00
Jordan Brown
837ee8eda9 Merge pull request #30295 2017-09-01 12:42:44 -04:00
MoreRobustThanYou
c48def94d8 Removes gangs (#30056) 2017-08-31 17:31:49 -03:00
Joan Lung
90524ea55c Fixes shield blobs not blocking atmos (#30291) 2017-08-31 13:24:21 -05:00
Leo
d7fe5e82f9 Merge pull request #30283 from pubby/multiverse
Removes the multiverse and its sword
2017-08-31 14:46:42 -03:00
Ian Turk
246b50bd4e Replaced datacore mob reference with a mind reference 2017-08-30 17:05:31 -06:00
pubby
6eb61d6f41 Crew monitoring rework part 1: crew pinpointers (#30117)
* Pinpointer refactor + Crew pinpointers

* Icon update

* Add crew pinpointers to maps, closets, and fix

* Fix defines

* Cyberboss fixes + add to warden and CMO

* More Cyberboss fixes
2017-08-30 18:02:28 -04:00
pubby
8c76d02224 Removes the multiverse 2017-08-29 19:27:42 -05:00
oranges
846c10e65a Merge pull request #30251 from ChangelingRain/newcultblade
Gives cult blades updated item and inhand sprites
2017-08-30 10:08:05 +12:00
Jordan Brown
f23bb93093 Merge pull request #30250
Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2017-08-29 11:22:14 -04:00
Jordan Brown
9bae1264a5 Merge pull request #30240 2017-08-29 10:44:09 -04:00
Jordan Brown
c1ef78f8c9 Soft crit (#28649)
* Soft crit

* Fix

* New define

* Fix shitcode

* Tabs not spaces

* Shitcomment

* Default to whispering in soft crit

* Fax
2017-08-28 14:42:11 -05:00
shizcalev
9be4b985a0 Updated clockwork cult to use DisplayPower() 2017-08-28 14:25:24 -04:00
Joan Lung
6d0b0f067d fix 2017-08-28 12:08:17 -04:00
Joan Lung
1ffa93a49d Gives cult blades new icons and inhands 2017-08-28 12:00:00 -04:00
Joan Lung
006d2b011e Cult ghosts can no longer be potentially deconverted or debrained 2017-08-28 11:20:12 -04:00
Cyberboss
c5c8dfdab1 Merge pull request #30200 2017-08-27 19:27:42 -04:00
Joan Lung
9556b8edc9 Removes the suppose-to-be unused shuttle wall path (#30214)
* Removes the unused shuttle wall path

* snip SNIP

* SNIP snip

* SNIP
2017-08-27 19:25:30 -04:00
Joan Lung
4482137fd7 Fixes the Geis+Sigil combo (#30205) 2017-08-25 23:29:35 -05:00
shizcalev
b946003be3 Fixes survival_pods being a valid_territory 2017-08-25 20:48:03 -04:00
Joan Lung
c208d1efa3 Some more tweaks to Geis (#29662)
* Some more tweaks to Geis

* fixes

* it rounds to 0.1

* let's bring this back

* this is kinda shitty but eh

* continually smart

* oh right
2017-08-24 20:46:15 -05:00
oranges
3c38573996 Merge pull request #30148 from kevinz000/revert-29542-wheresmyscanner
Revert "Refactors forensics to a datum"
2017-08-24 20:52:19 +12:00
kevinz000
169a950e7b Revert "Refactors forensics to a datum (#29542)"
This reverts commit 0a530cff9c.
2017-08-23 23:19:48 -07:00