Commit Graph

8691 Commits

Author SHA1 Message Date
ShizCalev
eb484edc2e Fixes scaner circuit typo (#35508) 2018-02-11 12:43:06 -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
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
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
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
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
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
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
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
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
a60e56597c Update soft_caps.dm 2018-02-11 05:35:55 -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
KorPhaeron
e64a42c248 Mining sentience upgrade grants minebots a radio and ID (#35235)
* Minebots get mining radio+ID card

* Updates radio implant paths
2018-02-11 05:13:46 -06:00
uraniummeltdown
e3ec8a648a Buildable Shuttle/Plastitanium Windows (#35376)
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows

* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
2018-02-11 05:13:37 -06:00
Jordan Brown
26174bd317 Ruins now log to world only in TESTING mode (#35421)
* Ruins now log to the game log instead of the runtime log

* Remove it entirely

* Use TESTING
2018-02-11 05:13:18 -06:00
Mokiros
cdcb5fc72f Buildable and upgradable All-In-One Grinder (#35451)
Circuit is in "Biological Processing" techweb node
2018-02-11 05:12:23 -06:00
Dax Dupont
7992256bcb Grabbers can now only contain things smaller than the assembly. (#35462)
* Grabbers can now only contain things smaller than the assembly

* Good suggestion buggy

* fucking github broke
2018-02-11 05:08:41 -06:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
deathride58
21be004afa Merge pull request #5406 from Citadel-Station-13/upstream-merge-35424
[MIRROR] Replaces some var values with defines
2018-02-11 02:24:48 +00:00
deathride58
a34dc0b90b Update personality.dm 2018-02-10 19:51:21 -05:00
deathride58
33a4ef416b Merge pull request #5405 from Citadel-Station-13/upstream-merge-35493
[MIRROR] Fixed cloning pod status not updating when autocloning.
2018-02-11 00:50:35 +00:00
deathride58
571ad489d4 Merge pull request #5404 from Citadel-Station-13/upstream-merge-35479
[MIRROR] Fixed chemical recipe conflicts
2018-02-11 00:50:15 +00:00
deathride58
d598695a3a Merge pull request #5403 from Citadel-Station-13/upstream-merge-35455
[MIRROR] Removes runlevels spec from SSoverlays
2018-02-11 00:50:03 +00:00
deathride58
60cef5a8db Merge pull request #5401 from Citadel-Station-13/upstream-merge-35459
[MIRROR] Fix a runtime if someone is deleted on the arrivals shuttle
2018-02-11 00:49:36 +00:00
Jordan Brown
fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
Jordan Brown
3674d38a99 Merge pull request #35493 from DaxDupont/cloner
Fixed cloning pod status not updating when autocloning.
2018-02-10 11:09:52 -06:00
Jordan Brown
bd0b5c2eb5 Merge pull request #35479 from Cruix/chem_collisions
Fixed chemical recipe conflicts
2018-02-10 11:04:34 -06:00
Jordan Brown
bed3f556c8 Removes runlevels spec from SSoverlays (#35455) 2018-02-10 11:02:20 -06:00
CitadelStationBot
d68892983c Merge pull request #5400 from Citadel-Station-13/upstream-merge-35449
[MIRROR] Integrated Circutry Readability Improvements
2018-02-10 11:01:08 -06:00
CitadelStationBot
9909e94c9e Merge pull request #5399 from Citadel-Station-13/upstream-merge-35437
[MIRROR] Fixes Morphine So that it can be made.
2018-02-10 11:00:56 -06:00
CitadelStationBot
3074958a7e Merge pull request #5398 from Citadel-Station-13/upstream-merge-35465
[MIRROR] Fixes the action button lock preference not saving
2018-02-10 11:00:46 -06:00
Jordan Brown
564860285d Fix a runtime if someone is deleted on the arrivals shuttle (#35459)
* Fix a runtime if someone is deleted on the arrivals shuttle

* Duh
2018-02-10 10:28:18 -06:00
Trevor Serpas
86e5775599 Integrated Circutry Readability Improvements (#35449)
* Integrated Circutry Readability Improvements

* support for old save files and fix a var I missed
2018-02-10 10:04:42 -06:00
Ordonis
0e22f30c39 Switched nitrogen for ethanol in morphine recipe. (#35437)
* Fixes Ordo not testing shit properly

* Lowers yield for balance purposes

Fug
2018-02-10 10:00:25 -06:00
Ashe Higgs
dd6a2541f4 Fixes button lock not saving (#35465) 2018-02-10 09:58:11 -06:00
Robustin
25323a9b12 Fixes limbgrower having max volume of 0 (#35491)
* Fixed limbgrower having maxvolume of 0

* Update limbgrower.dm
2018-02-10 09:56:56 -06:00
deathride58
0283c1677b Merge pull request #5393 from Citadel-Station-13/upstream-merge-35469
[MIRROR] Fixes map configuration values for nonexistent maps applying to box
2018-02-10 04:01:18 +00:00
deathride58
1b7658b4a5 Merge pull request #5392 from Citadel-Station-13/upstream-merge-35422
[MIRROR] Removes uneedful code
2018-02-10 04:00:34 +00:00
deathride58
9f37b3b70b Merge pull request #5391 from Citadel-Station-13/upstream-merge-35461
[MIRROR] Hatchets are now small instead of tiny.
2018-02-10 04:00:21 +00:00
deathride58
a46fdf8750 Merge pull request #5390 from Citadel-Station-13/upstream-merge-35463
[MIRROR] Cell blueprints now use the /empty variants
2018-02-10 04:00:08 +00:00
deathride58
935f070368 Merge pull request #5389 from Citadel-Station-13/upstream-merge-35476
[MIRROR] Fix goliath hide plates not applying to suits correctly
2018-02-10 03:59:54 +00:00
deathride58
9d96a6b78f Merge pull request #5388 from Citadel-Station-13/upstream-merge-35446
[MIRROR] can_synth uses TRUE/FALSE
2018-02-10 03:59:39 +00:00
deathride58
41db15db60 Merge pull request #5387 from Citadel-Station-13/upstream-merge-35454
[MIRROR] Adds defib to techwebs
2018-02-10 03:59:23 +00:00
deathride58
e3decd794d Merge pull request #5386 from Citadel-Station-13/upstream-merge-35453
[MIRROR] Aluminium with two i
2018-02-10 03:59:08 +00:00
Kyle Spier-Swenson
ca9ac1bdc1 Fixes map configuration values for nonexistent maps applying to box
This caused box'es min pop to get set to 50 because all of the servers still had cere defined with that limitation.
2018-02-09 18:13:12 -06:00
Jordan Brown
c554bc8c47 Removes uneedful code 2018-02-09 14:23:45 -06:00