Commit Graph

24047 Commits

Author SHA1 Message Date
Thalpy
f7d14ebb2c Damnit webedit 2019-10-08 07:39:19 +01:00
Thalpy
564c1fde9f Merge branch 'master' into Reagents_bitflats 2019-10-08 07:31:03 +01:00
CitadelStationBot
1cfcfb8e2e Automatic changelog generation for PR #9309 [ci skip] 2019-10-08 01:29:21 -05:00
kevinz000
0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
2019-10-07 23:29:19 -07:00
CitadelStationBot
46d6cf8a17 Automatic changelog generation for PR #9410 [ci skip] 2019-10-07 18:24:40 -05:00
nik707
de117afd8b Merge pull request #9410 from Poojawa/cryopod-tweaks
Fixes Cryopod quirks, makes the menu not complete shit
2019-10-07 18:24:38 -05:00
CitadelStationBot
e60f9534cb Automatic changelog generation for PR #9379 [ci skip] 2019-10-07 18:23:26 -05:00
nik707
b46c41cafd Merge pull request #9379 from jakeramsay007/Medbay-Doors
Adds unrestricted directional access to the medbay lobby and cloning access airlocks on all maps
2019-10-07 18:23:23 -05:00
CitadelStationBot
5777a0a196 Automatic changelog generation for PR #9384 [ci skip] 2019-10-07 18:20:02 -05:00
nik707
6803338df2 Merge pull request #9384 from jakeramsay007/Moar-Bugfixes
Fixes the Trek uniform/suit sprites
2019-10-07 18:19:59 -05:00
CitadelStationBot
071c23b101 Automatic changelog generation for PR #9434 [ci skip] 2019-10-07 15:20:26 -05:00
nik707
36d7a6f3bd Merge pull request #9434 from EmeraldSundisk/plantbox
Thinking green on Box Station.
2019-10-07 15:20:24 -05:00
EmeraldSundisk
6fc2373a58 Adds some potted plants. 2019-10-07 12:59:43 -07:00
CitadelStationBot
b2e71817d3 Automatic changelog generation for PR #9377 [ci skip] 2019-10-06 23:37:52 -05:00
kevinz000
dd46509597 Merge pull request #9377 from Thalpy/Fixes_melting_grenades
[Mild urgency] Fixes melting cleaning grenades found in janitor/cargoboxes.
2019-10-06 21:37:50 -07:00
Thalpy
27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01:00
CitadelStationBot
0de2a0daa8 Automatic changelog generation for PR #9382 [ci skip] 2019-10-05 10:27:02 -05:00
kevinz000
4fd31bce32 Merge pull request #9382 from jakeramsay007/Cyborg-chair-unbuckling
Borgs are now capable of unbuckling people from chairs, beds and themselves
2019-10-05 08:27:00 -07:00
CitadelStationBot
447d560efc Automatic changelog generation for PR #9405 [ci skip] 2019-10-05 10:26:42 -05:00
kevinz000
356755d710 Merge pull request #9405 from Thalpy/SPPEEEEDDDDDMERGE
[SPPEEEEDDDDDMERGE] Fixes buffers not doing stuff because oops
2019-10-05 08:26:40 -07:00
CitadelStationBot
6465c3e019 Automatic changelog generation for PR #9401 [ci skip] 2019-10-05 10:23:24 -05:00
kevinz000
22f9c9f711 Merge pull request #9401 from Poojawa/patch-2
APC UI autoupdates properly
2019-10-05 08:23:22 -07:00
CitadelStationBot
b674d695f8 Automatic changelog generation for PR #9388 [ci skip] 2019-10-05 10:22:49 -05:00
kevinz000
a923ea984a Merge pull request #9388 from Sishen1542/dynamicadminfix
Dynamic now auto-deadmin friendly
2019-10-05 08:22:47 -07:00
kevinz000
443e8105b5 Merge pull request #9400 from Poojawa/patch-1
Travis to 512.1488 for ?. operator compiler fix
2019-10-05 08:22:15 -07:00
CitadelStationBot
236cfe79e2 Automatic changelog generation for PR #9407 [ci skip] 2019-10-05 10:22:04 -05:00
kevinz000
b691da0bca Merge pull request #9407 from Poojawa/cryo-qol
Adds Cryo QoL with hotkeys
2019-10-05 08:22:01 -07:00
Poojawa
35d33b4f3b mob_occupant 2019-10-04 10:05:08 -05:00
Poojawa
cda97faaa5 UI and proper deletion stuff 2019-10-04 09:52:42 -05:00
Poojawa
209b195822 this probably doesn't fix the shitty console, but 2019-10-04 07:31:31 -05:00
Poojawa
0716b48a99 unmodularize it 2019-10-04 06:56:57 -05:00
CitadelStationBot
7dada70447 Automatic changelog generation for PR #9385 [ci skip] 2019-10-04 01:15:32 -05:00
kevinz000
828fe6e555 Merge pull request #9385 from Sishen1542/hypereut
fixing divine lightblade (chaplain hypereut) having energy reflect
2019-10-03 23:15:29 -07:00
Poojawa
9c4a808e7e Adds Cryo QoL with hotkeys
Ctrl click to swap power, Alt click to close/open machine. This is how you do a "QoL" PR.
2019-10-03 23:14:46 -05:00
Fermi
7f74a98372 .9 2019-10-04 04:55:36 +01:00
Fermi
62737884f0 lye was 13 oops 2019-10-04 04:55:16 +01:00
Fermi
2abd15c7e7 Incase someone speedmerges 2019-10-04 04:48:34 +01:00
Fermi
79e85e2cfa Fixes some runtimes 2019-10-04 03:53:02 +01:00
Fermi
d1c381cad3 lye down 2019-10-04 03:27:30 +01:00
Fermi
10f5fc3b47 Buffer fix 2019-10-04 03:22:53 +01:00
deathride58
2058cbd09f Merge pull request #9390 from Ghommie/Ghommie_cit212
Ensuring altdisarm() works as intended.
2019-10-03 20:16:05 -04:00
CitadelStationBot
8801781435 Automatic changelog generation for PR #9394 [ci skip] 2019-10-03 19:15:24 -05:00
deathride58
89875bfe98 Merge pull request #9394 from EmeraldSundisk/deltafeex
Unfucks Delta's cargo keycard device.
2019-10-03 20:15:22 -04:00
CitadelStationBot
b678ecc5a3 Automatic changelog generation for PR #9393 [ci skip] 2019-10-03 19:13:01 -05:00
deathride58
6e9a2553af Merge pull request #9393 from jakeramsay007/Even-More-Bugfixes
Fixes AIs being unable to talk through holopads
2019-10-03 20:12:59 -04:00
deathride58
35392d5dd0 Merge pull request #9396 from Citadel-Station-13/iconfixdonator
fixes bad icon path
2019-10-03 20:12:17 -04:00
Poojawa
a8e16ce27e APC UI autoupdates properly 2019-10-03 14:00:17 -05:00
Poojawa
d63540164d Travis to 512.1488 for ?. operator compiler fix
```
The ?. operator didn't handle some complex situations properly where it was the left-hand side of an expression and that expression was in turn the right-hand side of another. 
```

Byond fix to ensure the new meme
2019-10-03 13:52:05 -05:00
kevinz000
ccf49f8d21 Merge pull request #9398 from BlackMajor/Yeet
Stops ghosts from stealing your insurance details.
2019-10-03 05:19:46 -07:00
BlackMajor
02f0e4dd84 Ghosts stop stealing my paper work 2019-10-03 19:16:00 +13:00