Commit Graph

13556 Commits

Author SHA1 Message Date
deathride58 9b4ab9a45e Merge pull request #5428 from Citadel-Station-13/upstream-merge-35515
[MIRROR] Makes urinal cakes more realistic
2018-02-11 23:30:32 +00:00
deathride58 1d758999ae Merge pull request #5426 from Citadel-Station-13/upstream-merge-35555
[MIRROR] Fix sql error in exp updates
2018-02-11 23:30:21 +00:00
deathride58 8aacd2c804 Update job_exp.dm 2018-02-11 16:44:29 -05:00
CitadelStationBot 98fcd0c54c Makes urinal cakes more realistic 2018-02-11 15:29:47 -06:00
MoreRobustThanYou 6337c294d9 Makes urinal cakes more realistic (#35515)
* Add files via upload

* Makes urinal cakes blue

* Add files via upload

* Delete urinalcake_squish.png
2018-02-11 15:29:47 -06:00
Jordan Brown 08a12bba53 Fix sql error in exp updates 2018-02-11 15:25:23 -06:00
CitadelStationBot 4b88853918 Merge pull request #5424 from Citadel-Station-13/upstream-merge-35511
[MIRROR] Removes Map Merge 1
2018-02-11 13:19:15 -06:00
CitadelStationBot d5306f43de Automatic changelog generation for PR #5423 [ci skip] 2018-02-11 13:18:30 -06:00
CitadelStationBot 88e7fdabd6 Merge pull request #5423 from Citadel-Station-13/upstream-merge-35501
[MIRROR] Removed admin requirement for the notify chat command
2018-02-11 13:18:27 -06:00
CitadelStationBot 0eb199d59e Automatic changelog generation for PR #5422 [ci skip] 2018-02-11 13:18:11 -06:00
CitadelStationBot 39b4f8283d Merge pull request #5422 from Citadel-Station-13/upstream-merge-35508
[MIRROR] Fixes scaner circuit typo
2018-02-11 13:18:09 -06:00
CitadelStationBot 4f4ce8dc75 Automatic changelog generation for PR #5421 [ci skip] 2018-02-11 13:17:52 -06:00
CitadelStationBot fc8b7ed23b Merge pull request #5421 from Citadel-Station-13/upstream-merge-35510
[MIRROR] Megafauna doesn't go in machines
2018-02-11 13:17:50 -06:00
CitadelStationBot 8833c5da21 Automatic changelog generation for PR #5420 [ci skip] 2018-02-11 13:17:33 -06:00
CitadelStationBot c997056471 Merge pull request #5420 from Citadel-Station-13/upstream-merge-35509
[MIRROR] Removes duplicate air alarm on meta.
2018-02-11 13:17:31 -06:00
Jordan Brown d1fea8e4f7 Removes Map Merge 1 2018-02-11 13:03:47 -06:00
CitadelStationBot 30a78f51e5 Removed admin requirement for the notify chat command 2018-02-11 12:45:18 -06:00
Shadowlight213 080792a7a6 Removed admin requirement for the notify chat command (#35501) 2018-02-11 12:45:18 -06:00
CitadelStationBot 3787d740ae Fixes scaner circuit typo 2018-02-11 12:43:06 -06:00
ShizCalev eb484edc2e Fixes scaner circuit typo (#35508) 2018-02-11 12:43:06 -06:00
CitadelStationBot b7e93ff742 Megafauna doesn't go in machines 2018-02-11 12:41:52 -06:00
BordListian 87a1e69238 - You don't get to bring friends (#35510) 2018-02-11 12:41:52 -06:00
CitadelStationBot 766873b2df Removes duplicate air alarm on meta. 2018-02-11 11:36:36 -06:00
Jordan Brown 5fca9331f6 Merge pull request #35509 from DaxDupont/too-much-assblast
Removes duplicate air alarm on meta.
2018-02-11 11:36:36 -06:00
CitadelStationBot a55e4a3f90 Merge pull request #5413 from Citadel-Station-13/upstream-merge-35421
[MIRROR] Ruins now log to world only in TESTING mode
2018-02-11 09:44:26 -06:00
CitadelStationBot 2f49e98975 Automatic changelog generation for PR #5419 [ci skip] 2018-02-11 09:44:08 -06:00
CitadelStationBot 6de4146031 Merge pull request #5419 from Citadel-Station-13/upstream-merge-35504
[MIRROR] Removes that annoying clunking steam engine ambience sound that's probably from a youtube video
2018-02-11 09:44:06 -06:00
CitadelStationBot 9025a3df29 Merge pull request #5418 from Citadel-Station-13/upstream-merge-35502
[MIRROR] pet carriers can be actually made
2018-02-11 09:43:17 -06:00
CitadelStationBot 2c162a48a7 Automatic changelog generation for PR #5409 [ci skip] 2018-02-11 09:43:12 -06:00
CitadelStationBot 51d15518ae Merge pull request #5409 from Citadel-Station-13/upstream-merge-35456
[MIRROR] [s] Fixes altclick exploits
2018-02-11 09:43:09 -06:00
CitadelStationBot 81dcb41a4d Merge pull request #5417 from Citadel-Station-13/upstream-merge-35516
[MIRROR] [s]Blacklists the most recent version of byond for basically being a wall hack
2018-02-11 07:38:54 -06:00
CitadelStationBot 7f135fb5ca Automatic changelog generation for PR #5416 [ci skip] 2018-02-11 07:38:39 -06:00
CitadelStationBot 74c083fc89 Merge pull request #5416 from Citadel-Station-13/upstream-merge-35188
[MIRROR] Adds a SCP-294 ruin
2018-02-11 07:38:37 -06:00
CitadelStationBot 3ed32bc35f Automatic changelog generation for PR #5415 [ci skip] 2018-02-11 07:38:16 -06:00
CitadelStationBot f3569cf023 Merge pull request #5415 from Citadel-Station-13/upstream-merge-35235
[MIRROR] Mining sentience upgrade grants minebots a radio and ID
2018-02-11 07:38:14 -06:00
CitadelStationBot 1d9c08ca9d Automatic changelog generation for PR #5414 [ci skip] 2018-02-11 07:38:09 -06:00
CitadelStationBot 088ad78f95 Merge pull request #5414 from Citadel-Station-13/upstream-merge-35376
[MIRROR] Buildable Shuttle/Plastitanium Windows
2018-02-11 07:38:06 -06:00
CitadelStationBot 5b1880fd47 Update artefact.dm 2018-02-11 07:37:25 -06:00
CitadelStationBot 70b1e5897a Removes that annoying clunking steam engine ambience sound that's probably from a youtube video 2018-02-11 07:36:25 -06:00
Leo 4195cf4491 Merge pull request #35504 from vuonojenmustaturska/delambieng1
Removes that annoying clunking steam engine ambience sound that's probably from a youtube video
2018-02-11 07:36:24 -06:00
CitadelStationBot 1b907288c9 pet carriers can be actually made 2018-02-11 07:34:51 -06:00
Leo b55fd38680 Merge pull request #35502 from Tlaltecuhtli/patch-1
pet carriers can be actually made
2018-02-11 07:34:51 -06:00
CitadelStationBot 9864862418 Automatic changelog generation for PR #5412 [ci skip] 2018-02-11 05:37:28 -06:00
CitadelStationBot 092370e366 Merge pull request #5412 from Citadel-Station-13/upstream-merge-35451
[MIRROR] Buildable and upgradable All-In-One Grinder (again)
2018-02-11 05:37:26 -06:00
CitadelStationBot 7288abe554 Automatic changelog generation for PR #5410 [ci skip] 2018-02-11 05:37:08 -06:00
CitadelStationBot f4f9906cc5 Merge pull request #5410 from Citadel-Station-13/upstream-merge-35462
[MIRROR] Grabbers can now only contain things smaller than the assembly.
2018-02-11 05:37:06 -06:00
CitadelStationBot a60e56597c Update soft_caps.dm 2018-02-11 05:35:55 -06:00
CitadelStationBot e5b64b7c76 [s]Blacklists the most recent version of byond for basically being a wall hack 2018-02-11 05:14:05 -06:00
Kyle Spier-Swenson affcbcd609 [s]Blacklists the most recent version of byond for basically being a wall hack (#35516)
* Blacklisted client builds.

* Missed a spot

* glob was a mistake
2018-02-11 05:14:04 -06:00
MoreRobustThanYou 73c1088d5a Adds a SCP-294 ruin 2018-02-11 05:13:56 -06:00