Commit Graph
14597 Commits
Author SHA1 Message Date
vuonojenmustaturskaandCitadelStationBot bf63e9ad3f Merge pull request #36288 from Cyberboss/BansKevinzFinally
You can no longer SDQL select certain datums
2018-03-09 10:45:58 -06:00
LetterJayandGitHub ad0be11cbc Merge pull request #5865 from Citadel-Station-13/upstream-merge-36073
[MIRROR] [READY AND TESTED]Projectiles now properly delete themselves if they try to move and their trajectory is at an invalid turf
2018-03-09 04:53:41 -06:00
CitadelStationBot 0db1c5e8b1 Automatic changelog generation for PR #5864 [ci skip] 2018-03-09 04:53:26 -06:00
LetterJayandGitHub 2f2aed48e4 Merge pull request #5864 from Citadel-Station-13/upstream-merge-36051
[MIRROR] The ARM is now harder to obtain
2018-03-09 04:53:23 -06:00
CitadelStationBot 34c508996a Automatic changelog generation for PR #5863 [ci skip] 2018-03-09 04:53:14 -06:00
LetterJayandGitHub 5ac9ce4a02 Merge pull request #5863 from Citadel-Station-13/upstream-merge-36058
[MIRROR] Display cases can now have a list where to randomly spawn items from
2018-03-09 04:53:10 -06:00
LetterJayandGitHub f207fe1f08 Merge pull request #5862 from Citadel-Station-13/upstream-merge-36233
[MIRROR] Adds explicit check for numberless backpack contents in outfits.
2018-03-09 04:52:46 -06:00
CitadelStationBot 6ea8a60314 Automatic changelog generation for PR #5861 [ci skip] 2018-03-09 04:52:34 -06:00
LetterJayandGitHub 0e2531faaf Merge pull request #5861 from Citadel-Station-13/upstream-merge-36106
[MIRROR] To go even further byond... the above lighting layer!
2018-03-09 04:52:32 -06:00
LetterJayandGitHub c86aeef909 Merge pull request #5860 from Citadel-Station-13/upstream-merge-36195
[MIRROR] Minor say code cleanup
2018-03-09 04:52:18 -06:00
CitadelStationBot 6044902543 Automatic changelog generation for PR #5858 [ci skip] 2018-03-09 04:51:44 -06:00
LetterJayandGitHub b139c365c5 Merge pull request #5858 from Citadel-Station-13/upstream-merge-36217
[MIRROR] Sentient diseases get 2 minutes to select their initial host
2018-03-09 04:51:41 -06:00
CitadelStationBot 6d46c48f3c [READY AND TESTED]Projectiles now properly delete themselves if they try to move and their trajectory is at an invalid turf 2018-03-09 02:26:06 -06:00
kevinz000andCitadelStationBot 0905f68bbc Projectiles delete on invalid turf (#36073) 2018-03-09 02:26:05 -06:00
CitadelStationBot d8a9c0b8bd The ARM is now harder to obtain 2018-03-09 02:17:46 -06:00
RobustinandCitadelStationBot e9d3af6e61 The ARM is now harder to obtain (#36051)
* Added ARM difficulty

* Working edition Pt1

* Actually working Pt2

* Appropriate null check?

* Update narsie.dm
2018-03-09 02:17:46 -06:00
CitadelStationBot 2250b9bceb Display cases can now have a list where to randomly spawn items from 2018-03-09 02:17:37 -06:00
Dax DupontandCitadelStationBot 27ff0a4f28 Display cases can now have a list where to randomly spawn items from (#36058)
* Adds allowing display cases to pick from a random list

Keeps compatibility with older maps and moves trophy/plaque message to all display cases

* A bit more legible

* Refactors statues tool interaction code

* Don't override it already exists

* done
2018-03-09 02:17:36 -06:00
CitadelStationBot efbbea85f5 Adds explicit check for numberless backpack contents in outfits. 2018-03-08 23:21:28 -06:00
orangesandCitadelStationBot cc691e16a1 Merge pull request #36233 from AnturK/nulllove
Adds explicit check for numberless backpack contents in outfits.
2018-03-08 23:21:28 -06:00
CitadelStationBot 66de6f0df5 To go even further byond... the above lighting layer! 2018-03-08 22:43:23 -06:00
astralloopandCitadelStationBot e8548b392b To go even further byond... the above lighting layer! (#36106)
* This, is my normal form.

* THIS, IS A SUPER SAIYAN ASCENDED.

I CALL IT A SUPER SAIYAN 2

* Update lighting.dm

* Spelling correction (#3)

* Update layers.dm

* Update chunk.dm

* TO GO BYOND....

* Update lighting.dm
2018-03-08 22:43:23 -06:00
vuonojenmustaturskaandCitadelStationBot 8c87527005 Minor say code cleanup 2018-03-08 22:43:15 -06:00
CitadelStationBot 36fc47e665 Sentient diseases get 2 minutes to select their initial host 2018-03-08 22:42:57 -06:00
vuonojenmustaturskaandCitadelStationBot 423302ac3c Merge pull request #36217 from Cruix/disease_freemove
Sentient diseases get 2 minutes to select their initial host
2018-03-08 22:42:57 -06:00
CitadelStationBot 7bb63b0a21 Automatic changelog generation for PR #5817 [ci skip] 2018-03-07 23:59:03 -06:00
deathride58andGitHub 56845788ac Merge pull request #5817 from Zna12/Filet-o-fish
Filet-O-Sharkpeople
2018-03-08 05:59:01 +00:00
deathride58andGitHub 1850af961d Merge pull request #5852 from Citadel-Station-13/upstream-merge-36198
[MIRROR] Disease fixes
2018-03-08 05:58:11 +00:00
CitadelStationBot 1ef88050e0 Automatic changelog generation for PR #5851 [ci skip] 2018-03-07 23:57:41 -06:00
deathride58andGitHub fae68e4122 Merge pull request #5851 from Citadel-Station-13/upstream-merge-36202
[MIRROR] Small spellcheck in traits
2018-03-08 05:57:39 +00:00
deathride58andGitHub f836affa2e Merge pull request #5842 from Citadel-Station-13/upstream-merge-36191
[MIRROR] Allow configuring ruin/empty space level count
2018-03-08 05:57:03 +00:00
deathride58andGitHub 828322d870 Merge pull request #5841 from Citadel-Station-13/upstream-merge-36190
[MIRROR] Removes DEBUG from compile_options.
2018-03-08 05:56:37 +00:00
CitadelStationBot 4241d9036b Automatic changelog generation for PR #5846 [ci skip] 2018-03-07 23:56:20 -06:00
deathride58andGitHub 052705e7c5 Merge pull request #5846 from Citadel-Station-13/upstream-merge-36166
[MIRROR] Thirteen Loko is actually dangerous
2018-03-08 05:56:17 +00:00
CitadelStationBot 64530879c5 Disease fixes 2018-03-07 16:04:15 -06:00
vuonojenmustaturskaandCitadelStationBot 5cfc5f3730 Merge pull request #36198 from Cruix/disease_fixes
Disease fixes
2018-03-07 16:04:14 -06:00
CitadelStationBot b7ea12f543 Small spellcheck in traits 2018-03-07 16:03:01 -06:00
vuonojenmustaturskaandCitadelStationBot dfb0e9f7d6 Merge pull request #36202 from cebutris/lithenessk
Small spellcheck in traits
2018-03-07 16:03:01 -06:00
Zna12andGitHub 0941433022 Merge branch 'master' into Filet-o-fish 2018-03-07 10:41:09 -06:00
CitadelStationBot 5bc09eb7fc Thirteen Loko is actually dangerous 2018-03-07 07:15:23 -06:00
MMMiraclesandCitadelStationBot 48eac9e8c6 Thirteen Loko is actually dangerous (#36166)
* makes thirteen loko do the stuff it warns the person about

* you sceam in terror as you use the web editor!
2018-03-07 07:15:23 -06:00
CitadelStationBot 49eff85bf4 Allow configuring ruin/empty space level count 2018-03-07 01:48:13 -06:00
Tad HardestyandCitadelStationBot 6402912a32 Allow configuring ruin/empty space level count - #36191
Allows map configs to set how many ruin levels (def. 7) and how many empty levels (def. 1) that will be created. Most useful for landlocked stations, event/one-off stations with unusual composition, or testing situations such as RuntimeStation.
2018-03-07 01:48:13 -06:00
CitadelStationBot 6c7646dd3d Removes DEBUG from compile_options. 2018-03-07 01:32:41 -06:00
Jordan BrownandCitadelStationBot 61c2d7e435 Merge pull request #36190 from MrStonedOne/patch-489
Removes DEBUG from compile_options.
2018-03-07 01:32:41 -06:00
CitadelStationBot 4d0b7133c8 Automatic changelog generation for PR #5828 [ci skip] 2018-03-06 17:40:52 -06:00
PoojawaandGitHub 86b11050b6 Citadel's folder's end (#5828)
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
2018-03-06 17:40:48 -06:00
CitadelStationBot a1416622d2 Automatic changelog generation for PR #5806 [ci skip] 2018-03-06 12:28:25 -06:00
CitadelStationBotandPoojawa 534c4fcc18 [MIRROR] Space Parallax Tweak (#5806)
* Space Parallax Tweak (#36137)

* Tweaked contrasts

Upped the contrast on layer 1.
Tweaked the saturation to layer 2.

* more saturation and contrast

* tweak

* .

* Revert "."

This reverts commit 9590c657bac2c3afed007c82a7d05d36fd4249a6.

* Revert "Revert ".""

This reverts commit 6b9adf4d3fc13d6d3d934cc3eb9ea464c432c414.

* polish

* DO YOU SEE?

* Space Parallax Tweak
2018-03-06 12:28:22 -06:00
CitadelStationBot 33b87cedbe Automatic changelog generation for PR #5803 [ci skip] 2018-03-06 07:08:19 -06:00