Commit Graph

306 Commits

Author SHA1 Message Date
oranges dc731c991d Merge pull request #31315 from tgstation/Cyberboss-patch-3
Removes shitty sleep from area/Entered
2017-10-06 11:42:44 +13:00
Firecage ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage 2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
Jordan Brown 56ef3ab5a4 Removes shitty sleep from area/Entered 2017-10-04 15:28:17 -04:00
ShizCalev 2b89790dcb Fixes morgue maintenance radstorm protection (#31253)
* Morgue maint area

* Fixed typo
2017-10-03 17:11:06 -05:00
Jordan Brown 4178c209f1 Configuration datum refactor (#30763)
* Configuration datum refactor

* More WIP

* New easier on the eyes format

* More WIP

* Finished config.txt

* Fucktons more WIP

* The end of conversion draws near...

* Add all this shit

* Done converting entries finally

* Hunting down compile errors

* More WIP

* MORE CONVERSIONS

* More WIP

* More WIP

* Oh shit only 90 errors this time!

* IT COMPILES!!!

* Fixes world start runtimes
2017-09-29 15:36:51 +13:00
Ashe Higgs b7e7779c19 (Ready) Clockwork Cult Rework: Proof-of-concept (#29741)
* Starting on the rework

* Reworks the Ark

* Work on Reebe

* More Ark stuff

* this too

* Removes ark silliness, remaps Reebe a tad

* Spawning mechanics

* Work on gamemode code

* Finishes up ark stuff

* Removes Judgement, and lots of other changes

* New Ark activation sounds, Ratvar text

* Spawn protection!

* Adds the abscondence bijou

* Bijou stuff

* well, this is it

* somewhat absentminded coder

* Remaps the Reebe z

* replica fabricators now work!

* Guide paper!

* Now they're clockwork floors

* Infirmary, tweaks, numbers

* A new thing!

* this is ok for now

* I was gonna whine but it's actually necessary

* Adds damage scaling to ocular wardens

* I missed a thing

* you can go back too

* New clockwork armor sprites

* Weapons, scripture, oh my!

* no! shoo!

* hey, I forgot about you!

* this looks much better, I'll give you that

* no teleporting into the void!

* we have no need of you anymore

* Conflicteroos

* AUTOMATIC SPINNING CHAIRS

* how many times do we have to teach you this LESSON OLD MAN

* flagged!

* last time, meesa promise

* Conflicts 1

* wood filling

* Kindle is a projectile, and other stuff

* Chameleon jumpsuit, some small changes

* 150 hours of testing

* Curious is the trapmaker's art

* Conflicts 1

* naaah

* Fixes an ark sound

* Removes the prolonging prism

* Adds a delay to warping in

* First steps towards changing the power system

* Removes power from sigils, moves to global

* Conflicts 1

* zoom zoom

* Adds the stargazer, re-adds conversion

* conflicts? more like CLOCK-flicts

* get it? clockflicts?

* Daemon tuning

* Scraps components, 1/?

* A grace period, among other things

* You can't get to reebe from space no stop bad

* Adds some cogscarab shells to Reebe - yes, I get the sounds

* FUCK

* Chairs are very important.

* Clock golems, sound improvement, intercoms

* Sounds, floor fixes, conflicts

* Fixes the conflicts

* Prevents intercom use during non-clock rounds

* Wiki, HUD timer, tweaks, golems

* Components, removes unused structures, rep. fab power

* go-time

* Ending the round is not a good idea

* whoops, forgot about you

* ssh is ok

* this works too
2017-09-27 09:21:26 +13: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
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
pubby a3ee6652ae Fix CentCom issues (#30409) 2017-09-05 16:34:35 -05:00
Jordan Brown 728aefbd70 Adds DropLocation(). To generally be preferred to get_turf() (#29814)
Fixes #29802

Unlike get_turf()this will sensibly pick if loc can be safely used
2017-08-18 16:44:20 +12:00
Ian Turk d50b0c6e63 resolved conflicts 2017-08-16 13:11:21 -06:00
ShizCalev 0e8fa79065 Everything from before but less merge conflicty (#29905) 2017-08-16 15:17:10 -04:00
Ian Turk 7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Jordan Brown dce49b6caf Adds defines for mouse_opacity 2017-08-14 11:18:22 -04:00
Jordan Brown d1ae0a0c95 Adds helpers to avoid << use (#29611) 2017-08-09 00:27:54 -03:00
Jordan Brown e1ac655438 Merge pull request #29750 2017-08-08 09:59:11 -04:00
Jordan Brown 16592d8472 Merge pull request #29768 2017-08-08 09:58:56 -04:00
shizcalev 22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
shizcalev a02bb7b96a Shit shit 2017-08-07 03:14:23 -04:00
Cyberboss 8856e8046a Merge pull request #29734 2017-08-06 18:58:31 -04:00
shizcalev 4916458c69 Fixed cere and meta using prison station areas 2017-08-06 16:20:36 -04:00
shizcalev 86770a5419 Changed paths of space ruin areas 2017-08-06 16:07:20 -04:00
Xhuis ff2a7bed78 Fixes turning off an APC clearing weather sprites 2017-08-05 14:49:45 -04:00
shizcalev be4897945e cere finished 2017-08-02 23:24:15 -04:00
shizcalev 99624b8e74 further spellchecking 2017-07-31 23:09:08 -04:00
Jordan Brown 25c35c2829 Merge pull request #29455 2017-07-28 09:57:07 -04:00
Fox-McCloud 71c7e1fdee last tweaks 2017-07-27 17:45:08 -04:00
ShizCalev 0e9b3967e2 Spellchecks the map definitions (#29485) 2017-07-25 14:16:06 +12:00
ShizCalev 4f763d401b Fixes misc. map issues (#29386) 2017-07-22 13:11:47 -03:00
ShizCalev 45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
ShizCalev 59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Joan Lung f6ad5996f3 Rethemes the ash walker nest to match the Necropolis (#28886)
* Rethemes the Necropolis

* clen

* not clever enough, hmm...

* that's a bug. hello, bug.

* no message

* a terrifying Legion room. full of one (1) Legion.

* some tweaks, inside has actual floor type

* tweaks

* Rethemes the ash walker nest to match the necropolis

* fix some issues with the door version

* whoops

* run mapmerge tgm, does not tgm

* whoops

* whoops, all dirs

* tgm

* The bonfire has a grill

* nah just do what ergo wanted
2017-07-01 11:39:31 -03:00
Steelpoint f8ee37afc0 Ancient Space Station [Space Spawn Ruin] (#28584)
* FirstCommit

* HardsuitAncientSounds

* FurtherWorkSave

* HivebotSpriteMinorMapChange

* FinalFixesPrePR

* MinorFixes

* FixesPart1

* TGMMap

* Wording

* VoidSuitPlusSpelling

* TGMConv

* MoreSpelling

* RadioStorm

* SomehowGotThisToWork
2017-06-25 12:02:31 -04:00
shizcalev 37abb4466f cleanup and icons 2017-06-21 12:19:53 -04:00
MMMiracles 1bd6b03bcb deepstorage ruin revamp 2017-06-03 12:04:28 -04:00
ShizCalev 7f9d75f7aa [Meta] Var Cleanup and tweaks (#27871) 2017-05-31 10:56:39 -03:00
ShizCalev a917c2260c Lavaland - Ruins now have lights (#27844)
* lavaland lights

* donk

closes #27845

* dongs

closes #27845
2017-05-30 13:46:10 -06:00
WJohn 5c3b433489 New syndicate cosmetics, turfs, and spawners. (#27760)
* Loads of syndicate battlecruiser related content. Clothing, turfs, areas, and a few mob spawners.

* Moves new plaque turfs and all other ones to a new plaques dmi.

* does what joan asked

* whoops forgot to add some dmis and delete one

* Adds syndicate energy turrets.

* PROBABLY STILL OKAY

* Unticks file dir?

* Forgot to remove extra sprites in shuttles.dmi since they're now in proper dmis of their own in full size.
2017-05-28 18:02:33 +01:00
ShizCalev 6b54a7e604 Clean snow, lavaland, and thunderdome (#27742)
* fixes

fixes #27644

* lavaland

Fixes #27590
2017-05-28 15:23:16 +02:00
Joan Lung d1009b7739 Merge pull request #27736 from ShizCalev/lavaland-fixes
Lavaland Lighting Fix + ruin varedit cleanup
2017-05-28 09:14:59 -04:00
shizcalev 0bf0b012ae lavaland fixes
closes #19508
fixes #24777
2017-05-27 00:17:16 -04:00
Leo a1e88d2363 Fixes dirty in lavaland 2017-05-26 11:40:21 -03:00
ShizCalev ec6185dbfd [Box] Maintenance Cleanup (#27645) 2017-05-25 22:38:16 -03:00
ShizCalev 3ce8b2922c More Map Cleanup (#27559) 2017-05-24 18:19:11 -03:00
ShizCalev 82d5e8a51a Area Refactor + Var-edit Cleanup (#27530) 2017-05-23 00:07:48 -03:00
Joan Lung 449fb93545 Megafauna and lavaland mobs will no longer spawn directly on top of the mining base (#27476) 2017-05-21 22:10:32 -03:00
ShizCalev df0efe1a56 [All stations] Cleaned up var-editted areas (#27453) 2017-05-21 12:02:41 -03:00
Leo a7603e4aba Winter Wonderland holodeck no longer has freon, and it's no longer restricted. (#26718) 2017-04-30 16:12:45 -04:00
AnturK 1c0403e586 Fixes for Teleport verb 2017-04-25 22:23:05 +02:00