Commit Graph

876 Commits

Author SHA1 Message Date
Poojawa
bc0d14c193 Continual updates until merged 2018-09-17 04:55:03 -05:00
Poojawa
834a94b97d some compile fixes 2018-09-11 09:23:20 -05:00
Poojawa
09512a6001 Controllers 2018-09-11 02:04:10 -05:00
Poojawa
dfcde0eb3c Merge remote-tracking branch 'refs/remotes/origin/master' into changelog-memes 2018-09-10 23:51:25 -05:00
deathride58
1bc8b3530c Adds spawn text when spawning in as a miner. (#7555)
* adds spawn text when spawning in as a miner

* fixes compiling error
2018-09-07 07:22:44 -07:00
deathride58
55db128199 [EXPERIMENTAL] Let's give active turf processing it's own bloody subsystem. With blackjack! And hookers! (#7509)
* HOW ABOUT WE TAKE THE AIR PROCESSING

AND MOVE IT OVER THERE!!!!

* makes gas reactions happen in the original atmos subsystem so gas reactions run at the original atmos speed
2018-09-07 05:23:42 -07:00
deathride58
d080154423 Merge pull request #7529 from Trilbyspaceclone/patch-19
Makes slime cores be able to be made into sci points (Once per color type)
2018-09-06 13:33:22 -04:00
Poojawa
235bbae157 ports BSQL to go along with tools
There, now you can shut up about it not being ported you meme
2018-09-05 23:45:53 -05:00
deathride58
c8a3f56af6 Merge pull request #7489 from Citadel-Station-13/nanites
Nanites port
2018-09-03 13:47:28 -04:00
Trilbyspaceclone
20eca82aed Re adds in cores, Poojawa is correct here 2018-09-02 19:11:30 -04:00
Trilbyspaceclone
c59bac3116 list 2018-09-01 20:39:37 -04:00
Trilbyspaceclone
384d760338 adds oil slime core 2018-09-01 20:27:47 -04:00
Trilbyspaceclone
d3af787938 Fixes core DA and add slime core DA 2018-09-01 20:22:19 -04:00
LetterJay
1b11773cd9 DB port 2018-08-23 07:20:49 -05:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
deathride58
9fd285a548 Merge pull request #7464 from Citadel-Station-13/kevinz000-patch-7
Fixes master
2018-08-16 02:55:41 -04:00
deathride58
faa2b39ca2 buffs jukeboxes - makes jukebox sounds have double the falloff (#7458) 2018-08-14 23:07:22 -07:00
kevinz000
4608a040c1 Update research.dm 2018-08-14 23:05:49 -07:00
Trilbyspaceclone
845838d2b2 Buffs sci correctly this time (#7459) 2018-08-13 10:25:35 -07:00
kevinz000
4ff02b5a8b Sliding Puzzle 2018-08-07 04:44:12 -07:00
kevinz000
2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58
f1739cb482 Upstream fix mirror spree (#7362)
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
2018-07-20 03:40:39 -07:00
deathride58
d4146db593 Jukebox rework + environment/reverb controls for sounds played via playsound_local (#7367)
* Reworks jukeboxes - Makes jukeboxes a subsystem, adds realtime directional jukebox audio, adds environment/reverb controls to sounds played with TG procs

* fixes my stupidity, has no effect at all outside of boombox local branch

* minor optimizations, fixes jukebox sound not updating at all when the source is on a different z-level
2018-07-20 03:39:07 -07:00
kevinz000
b33d2b82fb Merge branch 'master' into mirror-38933 2018-07-14 15:26:49 -07:00
kevinz000
bcb1b04c40 Upstream mirror 2018-07-14 15:24:35 -07:00
deathride58
891bdd718d Merge pull request #7083 from Citadel-Station-13/kevinz000-patch-8
nerfs techwebs passive generation, pushes back full max time by 15 minutes
2018-07-06 01:38:42 -04:00
deathride58
b2ec8f89e0 missed files 2018-07-05 01:27:07 -04:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00
deathride58
63013f8964 everything to controllers 2018-07-02 00:10:31 -04:00
LetterJay
b2fb67c607 Merge pull request #7248 from Citadel-Station-13/upstream-merge-38683
[MIRROR] Fixes anomaly area selection.
2018-07-01 09:26:38 -05:00
LetterJay
605f7a1bf6 Merge pull request #7240 from Citadel-Station-13/upstream-merge-38675
[MIRROR] Fixed cyborgs not getting their names at round start
2018-07-01 09:24:46 -05:00
kevinz000
2f77e5894c Update research.dm 2018-06-26 16:39:22 -07:00
Jordan Brown
888b04427c Merge pull request #38683 from AnturK/anomalyfix
Fixes anomaly area selection.
2018-06-25 09:18:40 -05:00
LetterJay
cdd285f5c7 Update job.dm 2018-06-24 23:30:28 -05:00
LetterJay
d79b85d719 trims a few issues during mirror merges 2018-06-24 18:42:24 -05:00
LetterJay
acd10b02cf Merge pull request #7195 from Citadel-Station-13/upstream-merge-38574
[MIRROR] Global component signals
2018-06-24 18:20:17 -05:00
LetterJay
922e2a4515 Merge pull request #7200 from Citadel-Station-13/upstream-merge-38584
[MIRROR] Adds /datum/DBQuery/proc/SetQuery
2018-06-24 15:11:23 -05:00
LetterJay
06c7cebb82 Merge pull request #7188 from Citadel-Station-13/upstream-merge-38319
[MIRROR] [READY] Helps data disks stop being unemployed
2018-06-24 15:07:14 -05:00
LetterJay
6685bfcc8b Update dbcore.dm 2018-06-24 15:04:24 -05:00
CitrusGender
d50ae43d7f Fixed cyborgs not getting their names at round start 2018-06-24 13:55:03 -05:00
Jordan Brown
fcfdf968d1 Adds /datum/DBQuery/proc/SetQuery (#38584)
* Adds /datum/DBQuery/proc/SetQuery

* Needful newness
2018-06-20 02:18:53 -05:00
Jordan Brown
c11557d23d Global component signals 2018-06-19 17:18:34 -05:00
JStheguy
02744c59a5 [READY] Helps data disks stop being unemployed (#38319)
* data cards actually have a function now

* Adds data cards to the IC printer for real rea

* more cards, less shitty code

* how the fuck did I miss that

adds a missing ..()

* wait wrong use of ..() fuck
2018-06-19 09:23:33 -05:00
Jordan Brown
2cd045b8fe [s] Fixes direct sql datum call exploit. 2018-06-19 09:10:51 -05:00
CitadelStationBot
03a22ca16d [MIRROR] Transit space refactor (#7130)
* Transit space refactor

* Update bitfields.dm
2018-06-18 11:51:02 -07:00
AnturK
09414f87d4 Fixes R&D display runtime (#38501) 2018-06-16 06:15:40 -05:00
CitadelStationBot
f7924732c0 [MIRROR] Legacy config warning only happens if any legacy configs are present (#7089)
* Legacy config warning only happens if any legacy configs are present (#38421)

* Legacy config warning only happens if any legacy configs are present
2018-06-15 02:43:15 -07:00
CitadelStationBot
226780e0ed [MIRROR] Fixes vote ss trying to remove actions of people who already voted. (#7099)
* Fixes votes trying to remove actions of people who already voted. (#38431)

* Fixes vote ss trying to remove actions of people who already voted.
2018-06-13 19:30:14 -07:00
kevinz000
052f752c22 techwebs nerf 2018-06-12 14:24:55 -07:00