Commit Graph

2072 Commits

Author SHA1 Message Date
Cheridan 84480dafdf Merge pull request #20018 from Iamgoofball/revert-19952-a
Revert "Temporarily removes stock computers (#GoofFixYourShit)"
2016-08-27 03:04:47 -05:00
Incoming5643 1993b8d7ca [s] Adds the top secret room to centcom (#20071)
* Adds the top secret room to centcom, the final destination of players who manage to cosign themselves to nullspace.

Said room is an homage to a room that served a similar purpose in the legend of zelda.

* Follow up issues pull:
for loop optimization
game logging
spelling errors

* more info for admin message
2016-08-26 08:46:52 +12:00
Joan Lung df701a89be fixes dreamstation's disposals (#20105) 2016-08-25 15:02:06 -05:00
Joan Lung 243200470f base 2016-08-23 09:54:55 -04:00
Joan Lung 6167b187b0 Maintains Dream 2016-08-23 08:50:31 -04:00
oranges c505d389b4 Merge pull request #20000 from ChangelingRain/replacetheworthlesswithnothingeliminatethevaluelessremovethepointlessexterminatetheuseless
Removes some shitty lavaland ruins
2016-08-23 09:09:04 +12:00
Shadowlight213 4881e426f8 Removes input for efficiency ai sat being on the same grid as the output, leading to the apcs not charging. 2016-08-21 19:47:45 -07:00
Iamgoofball 206bf8fb08 Revert "Temporarily removes stock computers (#GoofFixYourShit)" 2016-08-21 15:28:09 -07:00
oranges c79be57b26 Merge pull request #19952 from Bawhoppen/a
Temporarily removes stock computers (#GoofFixYourShit)
2016-08-22 10:27:19 +12:00
Joan Lung d33b43e6f2 ruins do serve a purpose as shelter but these are crap 2016-08-21 09:00:59 -04:00
Joan Lung 0a59b1a3c8 Removes a shitty lavaland ruin 2016-08-20 21:43:33 -04:00
Joan Lung dd1f5c99fd Removes the sine pope (#19966)
* Removes the sine pope

* fuck you too map merger

* fuuuuuuck yooooooou

* map merger you betray me

* no message
2016-08-20 18:12:51 -05:00
Lularian 09eb5299df goof let me rest on your fertile chest 2016-08-18 09:23:38 -05:00
WJohn d4d6375d9f Fixes aux bases not having docking ports derp (#19943) 2016-08-17 21:59:50 -05:00
WJohn b1dc6cd5b7 Adds aux mining base. (#19892)
* First part of fixes and nondescript shit who even reads these

* all done
2016-08-18 12:54:58 +12:00
oranges 5fa249f97e Merge pull request #19729 from Shadowlight213/bayputers
[Review Ready] Ports baystation's modular computers
2016-08-17 13:23:51 +12:00
Cheridan 0ccea9faaf Merge pull request #19869 from Incoming5643/Ogrelap
Fixes overlapping space ruins
2016-08-14 22:02:09 -05:00
Shadowlight213 f61bfc814b Merge branch 'master' of https://github.com/tgstation/tgstation into bayputers 2016-08-14 17:26:52 -07:00
Incoming 18a7b0c606 Fixes a ton of area designation in space ruins that was causing ruin overlay
Deconverted ruins that were converted to tgm because the primary reason to use tgm (reduces merge conflicts) doesn't really matter on small, isolated ruin files.
2016-08-13 18:09:56 -04:00
Shadowlight213 f3a7f9e7ae Changes requested by cheridan 2016-08-13 00:59:51 -07:00
Shadowlight213 f1b4d71db0 Fixes some pixel offsets 2016-08-10 22:56:29 -07:00
Shadowlight213 02b39437e4 Adds the security temperature gun. 2016-08-10 22:48:53 -07:00
Shadowlight213 bfb0cca9fd Adds ntirc loggin
Adds a command console to the bridge.
2016-08-09 23:07:11 -07:00
Joan Lung e2ff27f184 Hopefully adds enough security officer spawns that #19757 will never happen again (#19762)
* Hopefully adds enough security officer spawns that #19757 will never happen again

* I need more spawns
2016-08-10 12:17:49 +12:00
Joan Lung db94623f6f Merge pull request #19686 from Incoming5643/the_darkness_in_my_heart_reveals_RNG
[s] local powergamer seen flying through space swinging crowbar wildly at void
2016-08-08 19:40:31 -04:00
Lularian cbd0aabfd5 ok 2016-08-07 02:56:25 -05:00
Shadowlight213 2b381baa25 Added ntnet relay to other maps. 2016-08-06 23:25:58 -07:00
Shadowlight213 4ebeec67d6 Adds header icons
Does some fixes and cleanup
Some consoles added to the map and tablets added to job loadouts for testmerging.
2016-08-06 23:05:05 -07:00
Lularian cb0e8ce998 my god 2016-08-07 00:56:08 -05:00
Incoming 72e50aeb13 Finding the pulse rifle in space is now treated the same as if you won it out of the arcade (but it won't get you the achievement) 2016-08-06 23:16:09 -04:00
Incoming e00d419590 Transitions the feature from meme PR to normal PR 2016-08-06 22:03:27 -04:00
Arctophylax 4b1a32044b Fixes loading of Winter and Medical Holodeck. (#19697) 2016-08-04 09:02:12 -05:00
Incoming d81b88a346 Occasionally there'll be one tile of space that's inexplicably fake 2016-08-03 18:02:26 -04:00
Xenomorph Warrior 5f9420ed6a Should hopefully fix the airlock having a wall under it on boxstation's emergency shuttle. (#19669)
* Should hopefully fix the airlock having a wall under it.

* mapmerge

* mapmerge
2016-08-03 10:35:15 -05:00
Shadowlight213 45d8e42138 Replaces bus in tcomms storage with circuit 2016-07-31 23:26:58 -07:00
Arctophylax 754c620af3 Fixes Birdboat Atmos (#19585) 2016-07-31 11:37:48 -05:00
Jordie 1bd74a3d19 Merge pull request #19545 from ChangelingRain/sheisafountainofblazingheattryingfailingtodrownherselfiniceandcoldbutnothingcandouseherheat
Fixes diagonal smoothing underlays
2016-07-30 13:21:52 +10:00
WJohn 6ab28dfe83 Adds tiny fans to lavaland golem ship airlocks. (#19563) 2016-07-29 09:32:58 -05:00
NikNakFlak a7b6e60d65 Sprite changes for bedsheets/signs, minor code cleaning (#19377)
* Bedsheets, sprite changes, sign

* Spelling

* Ugh, oldcode ew

* More more more

* does a thing

* Holy shit batman, this map merging thing sucks
2016-07-28 21:02:33 +12:00
oranges 3391e0d21e Merge pull request #19509 from MrStonedOne/linkedairlocks
[ready]Adds lazy airlock cycle pair system
2016-07-28 19:33:36 +12:00
MrStonedOne b5e1a08f70 Minor touchups 2016-07-28 00:21:52 -07:00
MrStonedOne 6d5ee15997 Shuttle dock detection, added system to box, admin var edit support 2016-07-27 21:49:42 -07:00
Joan Lung bd91c7e68d steam rises off of her 2016-07-27 22:20:05 -04:00
Joan Lung 06a6b7ef2d Fixes diagonal smoothing underlays 2016-07-27 22:17:08 -04:00
Joan Lung 8b34590623 Fixes metastation's broken tinted windows + misc map fixes (#19491)
* Fixes metastation's broken tinted windows + misc map fixes

* every kind of touch
2016-07-27 08:32:37 +12:00
Joan Lung 0fe4ad11de Fixes shuttles in transit having non-moving space on some diagonal edges (#19452)
* Fixes shuttles in transit having non-moving space on some diagonal edges

* it'll be
fine

* one moment, one second
one beautiful blessed scout attack
2016-07-25 21:14:36 +12:00
MMMiracles 23bf156fb0 Mjor: Creator of Original Assets (#19410)
🆑 MMMiracles
add: A giant wad of paper has been seen hurling through the nearby sector of SS13, officials deny existence of giant paper ball hurling through space because 'thats really fucking stupid'.
/🆑

Mjor the Creative, a wizard with the taste for the arts, has used his magical craft to form a home made of papier-mâché hurling through space because hes a wizard he can do whatever the fuck he wants. He uses his 'artistic' skill to conjure up minions to assist him when nosy people try to steal his priceless art.

He has two abilities he can use during a fight, one will summon copies of himself as mimics. Attacking a mimic does 50 brute to everyone around him and attacking him destroys all active mimics. The other ability lets him summon his crudely-drawn creations, bringing them to life to fight for him.

Killing him gives you access to his papier-mâché robe, a special collector's edition paper, and his priceless range of artwork. What more could you ask for?

The wizard's robe, when equipped, will allow the wearer to summon their own stickman allies. They are only loyal to who summoned them and will attack everything else. Ability has a cooldown between each use.

Boss code credit majority to @RemieRichards as it is a modified version of what she wrote up a couple months ago for one of my unfinished away missions.
2016-07-22 11:01:07 +12:00
oranges 4d70a39488 Merge pull request #19400 from Bawhoppen/mapfixes
All shuttles now use proper smoothing paths, I had to update them all by hand

I have a few more things to fix for titanium in this PR aswell

Also all syndie shuttles are now consistent with each other. (Added some more turrets since they aren't indestructible now)

(I was exaggerating/joking when I said its like 50 files changed but it turns out it actually is)

add: Titanium now spawns in mining again.
add: It has uses in R&D and robotics production.
add: All shuttle walls are now using a new proper smoothing path. Mappers please make sure to use this path correctly in the future. (along with tiles)
2016-07-22 10:11:46 +12:00
Shadowlight213 5f10739385 Repaths satchels and lets angels equip them (#19371)
Repaths satchels so all the different ones are children of the normal satchel.
Allows angels to equip satchels since the satchels are on the side of the body instead of the back. Should help miners who find the potion out a bit.
2016-07-22 10:10:30 +12:00
oranges ede9e60a0a Merge pull request #19376 from lzimann/blood
Moves blood crate back to surgery room instead of virology(box station)
2016-07-20 20:13:22 +12:00