Commit Graph
959 Commits
Author SHA1 Message Date
deathride58andGitHub 837779b683 Merge pull request #4109 from Citadel-Station-13/upstream-merge-33025
[MIRROR] Fixes Lord Singuloth hungering for more than he should
2017-11-24 23:15:09 +00:00
ShizCalevandCitadelStationBot 2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
Tad HardestyandCitadelStationBot 9806de310d Remove NODROP from water tank misters (#32995) 2017-11-24 12:59:25 -06:00
orangesandCitadelStationBot c43591982a Refactor on_reagent_change to pass through the change type 2017-11-24 12:59:09 -06:00
ACCountandCitadelStationBot 2147c60b7f Replaces "console screen" stock part with glass sheets 2017-11-23 18:53:47 -06:00
deathride58andGitHub c76cacdf77 Merge pull request #4081 from Citadel-Station-13/upstream-merge-32914
[MIRROR] [READY]NTnet refactor, assimilates exonet
2017-11-23 01:40:54 +00:00
deathride58andGitHub 435ac739fc Update machine_circuitboards.dm 2017-11-22 20:09:18 -05:00
LetterJayandGitHub eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
deathride58andGitHub 738c1b7b2a Update implantuplink.dm 2017-11-22 17:57:43 -05:00
deathride58andGitHub 1d4e3612ea Update PDA.dm 2017-11-22 17:56:49 -05:00
deathride58 b6630b41d1 merges #3877 proper 2017-11-22 17:37:22 -05:00
orangesandCitadelStationBot c2c22d56c7 [READY]NTnet refactor, assimilates exonet 2017-11-22 15:52:54 -06:00
orangesandCitadelStationBot cec6c028f5 [READY]Refactors uplinks to a component! 2017-11-22 15:17:03 -06:00
deathride58andGitHub d86bdf2150 Update trash.dm 2017-11-22 14:44:09 -05:00
ShizCalevandCitadelStationBot 6ab499b57b Fixes bartender suit having an adjust state 2017-11-22 12:40:32 -06:00
deathride58andGitHub 1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
ACCountandCitadelStationBot 8a64287249 Integrated circuit fixes and code improvements 2017-11-21 03:04:17 -06:00
deathride58andGitHub d2b251d23c Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844
[MIRROR] Cleans up unused code
2017-11-21 04:15:11 +00:00
deathride58andGitHub 8249c89cc0 Merge pull request #4040 from Citadel-Station-13/upstream-merge-32905
[MIRROR] Adds AI lawset spawners (mapping helpers)
2017-11-21 03:25:55 +00:00
Jordan BrownandCitadelStationBot 2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
Jordan BrownandCitadelStationBot 212071e075 Adds AI lawset spawners (mapping helpers) 2017-11-20 10:12:17 -06:00
ShizCalevandCitadelStationBot 831dde525e Makes drinking glasses smash when thrown 2017-11-20 02:45:22 -06:00
JordieandCitadelStationBot 2bf7b45919 Merge pull request #32880 from vuonojenmustaturska/chameleonprojfix
Fixes vehicles & chameleon projector
2017-11-19 22:39:14 -06:00
deathride58andGitHub 1d841ce65a Merge pull request #3994 from Citadel-Station-13/upstream-merge-32736
[MIRROR] RPD ui improvements
2017-11-18 05:40:13 +00:00
deathride58andGitHub eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00:00
duncathan saltandCitadelStationBot 52fc5e8bc6 RPD ui improvements 2017-11-17 18:03:56 -06:00
JordieandCitadelStationBot b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
vuonojenmustaturskaandCitadelStationBot 6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
deathride58andGitHub f6e4e77b80 Merge pull request #3962 from Citadel-Station-13/upstream-merge-32743
[MIRROR] Fixes pipe dispensers being unable to dispense bent pipes
2017-11-16 17:26:18 +00:00
ACCountandCitadelStationBot 1b9280776e Fixes pipe dispensers being unable to dispense bent pipes (#32743)
* Fixes pipe dispensers not dispensing bent pipes

* Updates meter RPD icon file to the one that's actually used
2017-11-15 19:12:34 -06:00
AutomaticFrenzyandCitadelStationBot cb7d45c980 actually use disable_warning mob_can_equip (#32750) 2017-11-15 19:07:01 -06:00
CitadelStationBotandGitHub e83b175f30 Merge pull request #3953 from Citadel-Station-13/upstream-merge-32729
[MIRROR] removes an unused var from radio code
2017-11-15 11:05:19 -06:00
LetterJayandGitHub 163ef812fb Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702
[MIRROR] Minor speedups to movement: First Blood Part 2
2017-11-15 10:41:16 -06:00
LetterJayandGitHub 16019df886 Merge branch 'master' into upstream-merge-32280 2017-11-15 10:21:04 -06:00
orangesandCitadelStationBot 156aa30c61 Merge pull request #32729 from Qustinnus/cheapGBP
removes an unused var from radio code
2017-11-15 01:27:24 -06:00
LetterJayandGitHub 62c7cfc4e7 Merge pull request #3938 from Citadel-Station-13/upstream-merge-32689
[MIRROR] Fixes a bunch of hand tele/portal issues.
2017-11-14 15:56:08 -06:00
vuonojenmustaturskaandCitadelStationBot 8136148303 Minor speedups to movement: First Blood Part 2 2017-11-14 15:00:45 -06:00
kevinz000andCitadelStationBot eba429f5b1 Hand teleporter and portal fixes. (#32689) 2017-11-14 13:11:55 -06:00
LetterJayandGitHub 8868a354b6 Update multitool.dm 2017-11-14 13:06:43 -06:00
arsserpentariumandCitadelStationBot d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJayandGitHub 0a21e6e83b Merge pull request #3904 from Citadel-Station-13/upstream-merge-32642
[MIRROR] Makes clown box consistent with the rest of the boxes
2017-11-13 11:45:13 -06:00
LetterJayandGitHub 9ff35c5b2c Merge branch 'master' into upstream-merge-32435 2017-11-13 11:30:06 -06:00
Emmett GainesandCitadelStationBot 3c35202b5e Performance and usability improvement for blueprints 2017-11-13 03:32:35 -06:00
LetterJayandGitHub 3ea8808201 Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161
[MIRROR] 512 forward compatibility merge
2017-11-12 23:06:55 -06:00
LetterJayandGitHub aa020ea9e8 Update electropack.dm 2017-11-12 16:00:15 -06:00
tortellinitonyandCitadelStationBot 89b23905b5 Makes clown box consistent with the rest of the boxes 2017-11-12 15:57:01 -06:00
LetterJayandGitHub de8e064e45 Update electropack.dm 2017-11-12 15:42:44 -06:00
LetterJayandGitHub 1c8d9b3a4e Update electropack.dm 2017-11-12 10:38:30 -06:00
LetterJayandGitHub 77d261aa8a Update camera_bug.dm 2017-11-12 10:02:32 -06:00
LetterJayandGitHub 298ddc8fa9 Update scrolls.dm 2017-11-12 08:56:30 -06:00