d9ff93fdff
consistency
2019-10-07 22:13:21 +02:00
99e9280eaf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178
2019-10-07 21:41:04 +02:00
b2e71817d3
Automatic changelog generation for PR #9377 [ci skip]
2019-10-06 23:37:52 -05:00
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
0de2a0daa8
Automatic changelog generation for PR #9382 [ci skip]
2019-10-05 10:27:02 -05:00
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
447d560efc
Automatic changelog generation for PR #9405 [ci skip]
2019-10-05 10:26:42 -05:00
356755d710
Merge pull request #9405 from Thalpy/SPPEEEEDDDDDMERGE
...
[SPPEEEEDDDDDMERGE] Fixes buffers not doing stuff because oops
2019-10-05 08:26:40 -07:00
6465c3e019
Automatic changelog generation for PR #9401 [ci skip]
2019-10-05 10:23:24 -05:00
22f9c9f711
Merge pull request #9401 from Poojawa/patch-2
...
APC UI autoupdates properly
2019-10-05 08:23:22 -07:00
b674d695f8
Automatic changelog generation for PR #9388 [ci skip]
2019-10-05 10:22:49 -05:00
a923ea984a
Merge pull request #9388 from Sishen1542/dynamicadminfix
...
Dynamic now auto-deadmin friendly
2019-10-05 08:22:47 -07:00
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
236cfe79e2
Automatic changelog generation for PR #9407 [ci skip]
2019-10-05 10:22:04 -05:00
b691da0bca
Merge pull request #9407 from Poojawa/cryo-qol
...
Adds Cryo QoL with hotkeys
2019-10-05 08:22:01 -07:00
7dada70447
Automatic changelog generation for PR #9385 [ci skip]
2019-10-04 01:15:32 -05:00
828fe6e555
Merge pull request #9385 from Sishen1542/hypereut
...
fixing divine lightblade (chaplain hypereut) having energy reflect
2019-10-03 23:15:29 -07:00
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
7f74a98372
.9
2019-10-04 04:55:36 +01:00
62737884f0
lye was 13 oops
2019-10-04 04:55:16 +01:00
2abd15c7e7
Incase someone speedmerges
2019-10-04 04:48:34 +01:00
d1c381cad3
lye down
2019-10-04 03:27:30 +01:00
10f5fc3b47
Buffer fix
2019-10-04 03:22:53 +01:00
2058cbd09f
Merge pull request #9390 from Ghommie/Ghommie_cit212
...
Ensuring altdisarm() works as intended.
2019-10-03 20:16:05 -04:00
8801781435
Automatic changelog generation for PR #9394 [ci skip]
2019-10-03 19:15:24 -05:00
89875bfe98
Merge pull request #9394 from EmeraldSundisk/deltafeex
...
Unfucks Delta's cargo keycard device.
2019-10-03 20:15:22 -04:00
b678ecc5a3
Automatic changelog generation for PR #9393 [ci skip]
2019-10-03 19:13:01 -05:00
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
35392d5dd0
Merge pull request #9396 from Citadel-Station-13/iconfixdonator
...
fixes bad icon path
2019-10-03 20:12:17 -04:00
a8e16ce27e
APC UI autoupdates properly
2019-10-03 14:00:17 -05:00
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
ccf49f8d21
Merge pull request #9398 from BlackMajor/Yeet
...
Stops ghosts from stealing your insurance details.
2019-10-03 05:19:46 -07:00
02f0e4dd84
Ghosts stop stealing my paper work
2019-10-03 19:16:00 +13:00
373afcf09e
Merge pull request #12 from Citadel-Station-13/master
...
Update master
2019-10-03 19:05:17 +13:00
70cbd8c1ca
fixes bad icon path
2019-10-02 22:11:42 -05:00
5fee649d55
Update DeltaStation2.dmm
2019-10-02 15:18:08 -07:00
8cbd7d6c06
Fixes AIs being unable to talk through holopads
2019-10-02 21:14:11 +01:00
4855474955
Making sure altdisarm() works as intended.
2019-10-02 19:39:23 +02:00
8b766130f8
Update eutactic_blades.dm
2019-10-02 12:48:17 -04:00
f6c80ddc48
Automatic changelog generation for PR #9365 [ci skip]
2019-10-02 02:06:16 -05:00
08ed166c08
Merge pull request #9365 from Ghommie/Ghommie-cit211
...
Fixing an issue with DNA scanners maintenance hatches with sleeper code updates.
2019-10-02 00:06:13 -07:00
1bf46e2152
Automatic changelog generation for PR #9373 [ci skip]
2019-10-02 02:02:07 -05:00
1aac0942e9
Merge pull request #9373 from Trilbyspaceclone/beepalm
...
Beebalm and Honeybalm plants
2019-10-02 00:02:05 -07:00
af9336edde
Merge pull request #9366 from Raptorizer/MelonSeedBuff
...
Equalized the power of the melon seed.
2019-10-02 00:01:05 -07:00
a177e5a457
Merge pull request #9364 from Ghommie/Ghommie-cit206
...
Fixing the blood cult radial menu unholy flask option's icon.
2019-10-01 23:59:49 -07:00
7320863b52
Automatic changelog generation for PR #9380 [ci skip]
2019-10-02 01:58:29 -05:00
657321e36b
Merge pull request #9380 from Ghommie/Ghommie_cit212
...
refactoring and fixing altdisarm() exploits (ergo pushing people over directional windows etc).
2019-10-01 23:58:27 -07:00
fbaa8d355f
Update dynamic.dm
2019-10-02 02:39:58 -04:00
a2a6fa17fe
Update eutactic_blades.dm
2019-10-01 23:33:14 -04:00
bf6575c67d
Borgs are now capable of unbuckling people from chairs, beds, and themselves.
2019-10-02 02:38:39 +01:00
Ghommie