Commit Graph

296 Commits

Author SHA1 Message Date
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
Cyberboss c64a489378 Remove more datum accesses 2017-04-17 13:37:09 -04:00
Cyberboss 4564df41f0 Some Initialize ports 2017-04-13 16:01:28 -04:00
Cyberboss 9e1ef0ffe2 Global variable wrappers (#25325)
* Add the system for managed global variables

* Travis ban old globals

* So you CAN inline proccall, that's neat

* Fix that

* master.dm

* Remove the hack procs

* Move InitGlobals to the proper spot

* configuration.dm

* Fix the missing pre-slash

* clockcult.dm

* This is probably for the best

* Doy

* Fix shit

* Rest of the DEFINES tree

* Fix

* Use global. for access

* Update find_references_in_globals

Always hated that proc

Whoever made it must've bee a r e a l idiot...

* __HELPERS tree

* Move global initialization to master.

Fix the declaration

* database.dm

* Dat newline

* I said DECLARATIVE order!

* Here's something you can chew on @Iamgoofball

* game_modes.dm

* Fix this

* genetics.dm

* flavor_misc.dm

* More stuff

* Do it mso's way. Keep the controllers as global

* Make master actually see it

* Fix

* Finish _globalvars/lists

* Finish the rest of the _globalvars tree

* This is weird

* Migrate the controllers

* SLOTH -> GLOB

* Lighting globals

* round_start_time -> ticker

* PAI card list -> pai SS

* record_id_num -> static

* Diseases list -> SSdisease

* More disease globals to the SS

* More disease stuff

* Emote list

* Better and better

* Bluh

* So much stuff

* Ahh

* Wires

* dview

* station_areas

* Teleportlocs

* blood_splatter_icons

* Stuff and such

* More stuff

* RAD IO

* More stuff and such

* Blob shit

* Changeling stuff

* Add "Balance" to changelogs

* Balance for changelog compiler + Auto Tagging

* Update the PR template

* hivemind_bank

* Bip

* sacrificed

* Good shit

* Better define

* More cult shit

* Devil shit

* Gang shit

* > borers

Fix shit

* Rename the define

* Nuke

* Objectives

* Sandbox

* Multiverse sword

* Announce systems

* Stuff and such

* TC con

* Airlock

* doppllllerrrrrr

* holopads

* Shut up byond you inconsistent fuck

* Sneaky fuck

* Burp

* Bip

* Fixnshit

* Port without regard

* askdlfjs;

* asdfjasoidojfi

* Protected globals and more

* SO MANY

* ajsimkvahsaoisd

* akfdsiaopwimfeoiwafaw

* gsdfigjosidjfgiosdg

* AHHHHHHHHHHHHHHHHHHHHHHH!!!!!

* facerolll

* ASDFASDFASDF

* Removes the unused parts of dmm_suite

* WIP

* Fix quote

* asdfjauwfnkjs

* afwlunhskjfda

* asfjlaiwuefhaf

* SO CLOSE

* wwwweeeeeewwwww

* agdgmoewranwg

* HOLY MOTHER OF FUCK AND THATS JUST HALF THE JOB?!?

* Fix syntax errors

* 100 errors

* Another 100

* So many...

* Ugh

* More shit

* kilme

* Stuuuuuufffff

* ajrgmrlshio;djfa;sdkl

* jkbhkhjbmjvjmh

* soi soi soi

* butt

* TODAY WE LEARNED THAT GLOBAL AND STATIC ARE THE EXACT SAME FUCKING THING

* lllllllllllllllllllllllllllllllllllllllllll

* afsdijfiawhnflnjhnwsdfs

* yugykihlugk,kj

* time to go

* STUFFF!!!

* AAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!!!!!!

* ngoaijdjlfkamsdlkf

* Break time

* aufjsdklfalsjfi

* CONTROL KAY AND PRAY

* IT COMPILEELEELELAKLJFKLDAFJLKFDJLADKJHFLJKAJGAHIEJALDFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

* Goteem

* Fix testing mode

* This does not belong in this PR

* Convert it to a controller

* Eh, fuck this option

* Revert controllerization Ill do it some other time

* Fix

* Working controllerization

* FOR THE LOVE OF CHRIST PROTECT THE LOGS

* Protect admins and deadmins

* Use the inbuilt proc
2017-04-06 23:26:13 -06:00
Cyberboss 5278ccda6a Fixes firedoors auto-opening/closing without power 2017-03-30 12:02:54 -04:00
Mr Potato Shaman 1cf160c1b3 Supermatter Area / Air Alarm Tweak (#25309) 2017-03-21 11:53:49 -03:00
Leo 5aeb4d7a87 Merge pull request #25168 from ChangelingRain/wizarddenfix
The Wizard's Den now has dynamic lighting
2017-03-17 12:37:13 -03:00
MrPerson b71e89ce10 Fixes non-dynamically lit areas being pitch black
Fixes #25179 (Legitimate closing of a pull request, thanks for this bug github)
Fixes #25164
2017-03-16 21:30:06 -07:00
Joan Lung 1579256ffd The Wizard's Den now has dynamic lighting 2017-03-16 09:46:14 -04:00
MrPerson db34a1f2be Merge branch 'master' of https://github.com/tgstation/-tg-station into revert_revert_revert_come_on_revert_please_rever_please_shit_REVERT_JESUS_TAPDANCING_CHRIST_REVERT_YOU_FUCKING_PIECE_OF_GODDAMN_PISS
Conflicts:
	code/_onclick/hud/plane_master.dm
	code/modules/lighting/lighting_object.dm
2017-03-15 18:53:09 -07:00
Joan Lung c4e95a0344 Shuttles and Centcom now have dynamic lighting (#24993)
* Shuttles now have dynamic lighting

* heh

* there we go

* Centcom now supports light tm

* fixes the supply shuttle

* statue

* new and improved
2017-03-14 12:10:07 +13:00