 Ghommie
|
a9e30720ec
|
key, ckey, key, ckey
|
2019-10-06 18:40:24 +02:00 |
|
|
Ghommie
|
f01f00710f
|
Porting some spraycan fixes.
|
2019-10-06 05:30:16 +02:00 |
|
|
ThalpyandGitHub
|
27c2c89766
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-05 23:43:19 +01:00 |
|
|
Ghommie
|
cac4157894
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-10-05 22:03:37 +02:00 |
|
|
Ghommie
|
32a73b24c0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
|
2019-10-05 18:22:43 +02:00 |
|
|
kevinz000andGitHub
|
356755d710
|
Merge pull request #9405 from Thalpy/SPPEEEEDDDDDMERGE
[SPPEEEEDDDDDMERGE] Fixes buffers not doing stuff because oops
|
2019-10-05 08:26:40 -07:00 |
|
|
kevinz000andGitHub
|
22f9c9f711
|
Merge pull request #9401 from Poojawa/patch-2
APC UI autoupdates properly
|
2019-10-05 08:23:22 -07:00 |
|
|
kevinz000andGitHub
|
b691da0bca
|
Merge pull request #9407 from Poojawa/cryo-qol
Adds Cryo QoL with hotkeys
|
2019-10-05 08:22:01 -07:00 |
|
|
Ghommie
|
367789fda4
|
yes
|
2019-10-05 07:16:17 +02:00 |
|
|
Ghommie
|
3d22f4ec60
|
Porting a load of disease/symptoms code updates.
|
2019-10-05 07:14:25 +02:00 |
|
|
Ghommie
|
34bef911b2
|
macro arguments
|
2019-10-05 03:49:06 +02:00 |
|
|
Ghommie
|
b6cc81d097
|
flooring.
|
2019-10-05 03:13:51 +02:00 |
|
|
Ghommie
|
e4705ae5c0
|
Actually... let's do some scaling.
|
2019-10-05 02:57:50 +02:00 |
|
|
Ghommie
|
2b8fe43ef1
|
Removes the minimum player cap for the war ops.
|
2019-10-05 02:31:02 +02:00 |
|
|
Poojawa
|
9f88a72142
|
Makes Medsprays align with patches
Also ensures you can't spray it on ghosts, ai eyes, etc.
|
2019-10-04 16:06:07 -05:00 |
|
|
Ghommie
|
1c2f2617d8
|
Ports "Makes supermatter melt walls if it finds itself in one"
|
2019-10-04 22:44:40 +02:00 |
|
|
Poojawa
|
e52652f8c8
|
Differing carpet reactions
|
2019-10-03 23:19:52 -05: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 |
|
|
FermiandFermi
|
7f74a98372
|
.9
|
2019-10-04 04:55:36 +01:00 |
|
|
FermiandFermi
|
62737884f0
|
lye was 13 oops
|
2019-10-04 04:55:16 +01:00 |
|
|
Poojawa
|
6d9aa8de70
|
More carpet options and ways to get them
|
2019-10-03 22:54:10 -05:00 |
|
|
FermiandFermi
|
79e85e2cfa
|
Fixes some runtimes
|
2019-10-04 03:53:02 +01:00 |
|
|
FermiandFermi
|
10f5fc3b47
|
Buffer fix
|
2019-10-04 03:22:53 +01:00 |
|
|
deathride58andGitHub
|
2058cbd09f
|
Merge pull request #9390 from Ghommie/Ghommie_cit212
Ensuring altdisarm() works as intended.
|
2019-10-03 20:16:05 -04:00 |
|
|
deathride58andGitHub
|
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 |
|
|
PoojawaandGitHub
|
a8e16ce27e
|
APC UI autoupdates properly
|
2019-10-03 14:00:17 -05:00 |
|
|
BlackMajor
|
02f0e4dd84
|
Ghosts stop stealing my paper work
|
2019-10-03 19:16:00 +13:00 |
|
|
Chayse Ramsay
|
8cbd7d6c06
|
Fixes AIs being unable to talk through holopads
|
2019-10-02 21:14:11 +01:00 |
|
|
Ghommie
|
4855474955
|
Making sure altdisarm() works as intended.
|
2019-10-02 19:39:23 +02:00 |
|
|
Chayse Ramsay
|
68ca8a5ac0
|
whoops
|
2019-10-02 11:55:38 +01:00 |
|
|
Seris02andGitHub
|
eb3f26545d
|
Merge pull request #3 from Citadel-Station-13/master
Updating my fork on a web browser, oof
|
2019-10-02 16:11:02 +08:00 |
|
|
Seris02andGitHub
|
0f101de5ac
|
Undoing the other one
Because I'm on my web browser doing this and I can't figure out how to revert
|
2019-10-02 16:05:26 +08:00 |
|
|
kevinz000andGitHub
|
1aac0942e9
|
Merge pull request #9373 from Trilbyspaceclone/beepalm
Beebalm and Honeybalm plants
|
2019-10-02 00:02:05 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
Sishen
|
f3d373a6b8
|
loose goose
honk honk
|
2019-10-02 02:27:30 -04:00 |
|
|
Chayse Ramsay
|
5c827ed8ed
|
Fixes the Trek uniform/suit sprites
Not having mutant additions was causing the update_icons code to null out the alternate_worn_icon variable
|
2019-10-02 04:08:25 +01:00 |
|
|
Ghommie
|
81fc0c1b32
|
more foolproofing.
|
2019-10-02 00:37:02 +02:00 |
|
|
Ghommie
|
d2300765b2
|
adjacency checks.
|
2019-10-01 23:16:47 +02:00 |
|
|
Ghommie
|
cfcd325778
|
reworking the shoving people action.
|
2019-10-01 23:13:08 +02:00 |
|
|
Ghommie
|
340f8498a3
|
Fixes some more issues with shoving people.
|
2019-10-01 22:11:41 +02:00 |
|
|
Seris02andGitHub
|
07f7e6105a
|
SPOOKTOBER
because serb told me to
|
2019-10-01 22:14:05 +08:00 |
|
|
Seris02andGitHub
|
89277e6206
|
Merge pull request #2 from Citadel-Station-13/master
updating fork from browser
|
2019-10-01 22:11:14 +08:00 |
|
|
FermiandFermi
|
4b6d996416
|
Merge branch 'master' into Blind-quirk-without-anger
|
2019-10-01 08:41:12 +01:00 |
|
|
kevinz000andGitHub
|
250c6ed986
|
Merge pull request #9367 from Poojawa/totally-radical
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
|
2019-10-01 00:12:32 -07:00 |
|
|
FermiandFermi
|
2bbcc7f660
|
Fixes them sneaky nades
|
2019-10-01 06:48:15 +01:00 |
|
|
FermiandFermi
|
553818504c
|
Hoepfully fixes unwanted traumas in the dead.
|
2019-10-01 06:21:34 +01:00 |
|
|
FermiandFermi
|
89f3a01bc0
|
Merge branch 'master' into tg-Organ-port
|
2019-10-01 06:17:58 +01:00 |
|
|
TrilbySpaceClone
|
3f893195bf
|
tested!
|
2019-09-30 11:42:07 -04:00 |
|
|
FermiandFermi
|
0762ed5265
|
oops, but also this shouldn't be able to be made.
|
2019-09-29 20:25:00 +01:00 |
|
|
FermiandFermi
|
f83de63124
|
Kev's scanner malarky
|
2019-09-28 17:51:55 +01:00 |
|