Commit Graph

618 Commits

Author SHA1 Message Date
CitadelStationBot
ba06d1cb97 [MIRROR] Listening fix (#5231)
* Removes ghost spawner from Syndicate listening ruin (#35083)

* Does what Kor says

* Other part of the fix if Kor wants it

* Does what KorPhearon wants

* Listening fix
2018-02-04 22:09:38 -06:00
CitadelStationBot
450fda474a [MIRROR] Corrects space tiles on Abandoned Teleporter (#5224)
* Corrects space tiles on Abandoned Teleporter

* Corrects space tiles on Abandoned Teleporter
2018-02-04 22:06:04 -06:00
deathride58
30ab115665 Makes Cit widescreen by default (#4374)
* updates title screen to be WIDESCREEN

* increase default size of view window

* widescreen fullscreen overlays

* and finally, the switch can be hit

* Update skin.dmf

* readds splitter=75, the main screen breaks without it
2018-02-04 21:29:48 -06:00
deathride58
09436512b4 Merge branch 'master' into TG-sync-testing 2018-02-03 01:52:44 +00:00
Zna12
5e06583dad What a mess. (#5238)
This should fix the issue of having the minerals and output coming out of the wrong sides of the ORM.
2018-02-01 06:20:43 -08:00
Poojawa
faccc43461 fucking github REEEEEEEEEEE 2018-01-31 18:33:46 -06:00
Poojawa
ebf5366e73 Delta was apparantly a github copy/paste wtf 2018-01-31 18:23:42 -06:00
Poojawa
ab0e0667f2 Makes Travis happy 2018-01-31 18:11:19 -06:00
Poojawa
cf537cd417 Removing abandon map. 2018-01-31 11:18:41 -06:00
Poojawa
d7659ac6b2 sync with master 2018-01-31 07:02:55 -06:00
Poojawa
56232d5d60 Maps and misc 2018-01-31 06:20:26 -06:00
LetterJay
391e317451 Merge pull request #5220 from Citadel-Station-13/upstream-merge-35113
[MIRROR] Morgue and Crematorium Repositions
2018-01-31 04:14:27 -06:00
LetterJay
3fa1dbb721 Merge pull request #5168 from Zna12/Cargo-ORM-Security
Cargo orm security
2018-01-31 03:02:48 -06:00
LetterJay
eb49ebcce5 Merge pull request #5158 from Citadel-Station-13/upstream-merge-35073
[MIRROR] Fixes bad APC name on Boxstation
2018-01-31 03:02:19 -06:00
LetterJay
a45e8527db Merge pull request #5121 from Citadel-Station-13/upstream-merge-34935
[MIRROR] OH GOD HOW DID THE MAPS GET SMALLER?
2018-01-31 03:02:10 -06:00
Jittai
f8bf40e7cc Morgue and Crematorium Repositions 2018-01-31 02:21:45 -06:00
Poojawa
a24788842b dogborg tweaks, so fuggin DUMB (#5202)
* apparantly you need shuttles, who knew

* some tweaks

Sprites need adjustments
Janidogs need adjustments in UI

* Hm, maybe a fix. Revert attempt to rename sprites

* [MIRROR] Better Chat Squashing (#5193)

* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing

* [MIRROR] Sexy Solar Sprites (#5191)

* replaced solar panel sprites with better ones

* Sexy Solar Sprites

* Automatic changelog generation for PR #5191 [ci skip]

* [MIRROR] New Coffin Sprite (#5190)

* coffins have a new sprite (#34995)

* New Coffin Sprite

* Automatic changelog generation for PR #5190 [ci skip]

* [MIRROR] Makes fire colorful and anime (#5187)

* Makes fire colorful and anime (#34977)

* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.

* Makes fire colorful and anime

* Automatic changelog generation for PR #5187 [ci skip]

* [MIRROR] Expand Cyborg (#5183)

* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg

* Automatic changelog generation for PR #5183 [ci skip]

* [MIRROR] Cosmic Bedsheet (#5170)

* adds cosmic space bedsheet

* Cosmic Bedsheet

* [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174)

* Merge pull request #34964 from MrStonedOne/patch-463

The punisher no longer punishes ticker subsystems with delayed fires

* The punisher no longer punishes ticker subsystems with delayed fires

* Fuck this I'm done with it
2018-01-30 15:17:46 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
Zna12
1a337792e6 Whoops.
Used the wrong flooring under the windows I added.
2018-01-28 22:39:27 -06:00
Zna12
a4cdb47aa7 Pubby Station ORM Security 2018-01-28 21:09:15 -06:00
Zna12
3c70a621d4 Omega Station ORM Security
Added a windoor with Mineral Storage access to Omega's ORM
2018-01-28 21:07:52 -06:00
Zna12
e457b1ddc5 Meta Station ORM Security
Added a windoor to Meta Station's ORM
2018-01-28 21:05:50 -06:00
Zna12
906412690d Delta Station ORM Movement
Delta Station ORM Moved to more publicly accessable area.
2018-01-28 21:03:32 -06:00
Zna12
27204a32c8 Box Station ORM and Protolathe Movements
Moved the ORM and Protolathe in cargo around to help lower the ammount of break ins that happen.
2018-01-28 20:56:06 -06:00
Zna12
51b8d8706a Revert "ORM Security."
This reverts commit f6af76ab4e.
2018-01-28 20:18:41 -06:00
Zna12
f6af76ab4e ORM Security.
Ore Redemption Machines have been moved to more publicly accessable areas on Box and Delta stations. All stations now have a Mineral Storage locked windoor in front of the ORM. Also moved the Cargo Protolathe into the mining dock because Miners kept breaking into the cargo bay to grab shit on high pop rounds.
2018-01-28 18:54:52 -06:00
Jordan Brown
b9f575fa11 Merge pull request #34926 from ShizCalev/morguetray-revenant
Makes revenants spawn on dead bodies & bodycontainers
2018-01-28 18:03:41 -06:00
Leo
d4fb182401 Merge pull request #35073 from ShizCalev/box-fixes
Fixes bad APC name on Boxstation
2018-01-28 16:22:56 -06:00
FrozenGuy5
a77e139fd8 Changes up the Construction Area on Box slightly. 2018-01-28 14:33:41 -06:00
Jalleo
0ceb915b60 Same with the SPACE_IS_SMALLER but only with smaller maps (#34984) 2018-01-27 23:20:25 -06:00
Jalleo
6d5250f18b Shrinks template maps (#34935)
* OH GOD HOW DID THE MAPS GET SMALLER?

* How did that happen?

* Removes one more row
2018-01-26 08:46:40 -06:00
LetterJay
13c3c7b4e7 Merge pull request #5038 from Citadel-Station-13/upstream-merge-34466
[MIRROR] Fake nuclear disks are even more convincing
2018-01-25 13:41:02 -06:00
LetterJay
069972b3a0 map 2018-01-25 12:59:30 -06:00
LetterJay
41adb46c2a fixes travis 2018-01-24 21:51:02 -06:00
LetterJay
1dffa54809 Merge pull request #5091 from Citadel-Station-13/upstream-merge-34623
[MIRROR] Makes templates able to use PlaceOnTop
2018-01-24 21:44:21 -06:00
LetterJay
c30127d0d5 Merge pull request #5089 from Citadel-Station-13/upstream-merge-34841
[MIRROR] Fixes derelict area issues
2018-01-24 21:43:24 -06:00
Jordan Brown
829cf4d180 Merge pull request #34623 from ninjanomnom/template-placeontop
Makes templates able to use PlaceOnTop
2018-01-24 18:18:31 -06:00
Jordan Brown
5d4531010d Merge pull request #34841 from ShizCalev/derelict-fix
Fixes derelict area issues
2018-01-24 18:09:54 -06:00
MMMiracles
521e309da4 baseturf editors on syndicate base (#34815) 2018-01-24 15:43:33 -06:00
LetterJay
937d6c473a Merge pull request #5048 from Citadel-Station-13/upstream-merge-34769
[MIRROR] Cleans up unused mob vars
2018-01-24 13:56:23 -06:00
Jordan Brown
d7975510e4 Fixes omega missing a wheat fridge and runtiming pipenets 2018-01-24 06:12:20 -06:00
Leo
90b2e77b78 Merge pull request #34769 from ShizCalev/var-cleanup
Cleans up unused mob vars
2018-01-23 06:44:32 -06:00
coiax
f425c5496f Fake nuclear disks are even more convincing 2018-01-23 01:41:21 -06:00
LetterJay
c5ec80819f Merge pull request #4943 from Citadel-Station-13/upstream-merge-34571
[MIRROR] Low memory mode
2018-01-21 11:47:27 -06:00
LetterJay
8fe7ac2b6f Merge pull request #4927 from Citadel-Station-13/upstream-merge-34581
[MIRROR] Corrects some stacked turf
2018-01-21 11:46:51 -06:00
deathride58
15d1adfea8 Update _basemap.dm 2018-01-19 14:38:12 -05:00
Jordan Brown
f706605227 Low memory mode 2018-01-19 09:12:37 -06:00
Jordan Brown
95b6959190 Merge pull request #34576 from coiax/removes-teleport-beacon-from-golem-ship
Removes teleport beacon from Free Golem Ship
2018-01-19 08:50:20 -06:00
Leo
b59c8c6e71 Merge pull request #34581 from ShizCalev/stacked-turf-cleanup
Corrects some stacked turf
2018-01-19 08:16:31 -06:00
ShizCalev
f93ca08aa7 Fixes irreparable plating (#34472) 2018-01-18 20:13:25 -06:00