e286bd40f3
Merge remote-tracking branch 'upstream/master'
2024-08-27 15:43:55 -05:00
75d1a7d69c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-08-26 04:31:35 -03:00
dc08550162
push
2024-08-25 04:38:03 -03:00
4fcf3f35d1
Also fix this
2024-05-03 21:57:22 +02:00
dbd4505372
Merge remote-tracking branch 'upstream/master'
2024-04-30 19:02:41 -05:00
91a9223df6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-25 17:08:42 -03:00
0517ece12a
fixes floor decals and other missing signal-added overlays by making sure things properly call parent update_icon
2024-04-24 22:30:25 -04:00
4c25ac80a7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-16 18:25:10 -03:00
a639499d3a
Fix invalid gun overlays
2024-04-16 02:25:20 -04:00
0b4dcfd73a
Fix invalid gun overlays
2024-04-16 02:19:41 -04:00
2f683eee31
Fix string cell types
2024-04-16 01:20:59 -04:00
b25da4ba53
Fix invalid gun overlays
2024-04-16 01:20:59 -04:00
e74d787bf1
Fix string cell types
2024-04-16 01:14:28 -04:00
86c1a2eeaa
Fix invalid gun overlays
2024-04-16 01:14:28 -04:00
fc53ab850c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-14 20:15:08 -03:00
e37fbc72e0
Fix miniature egun overlays
2024-04-13 20:14:19 -04:00
54f584fa80
Fix instakill laser rifle overlays
2024-04-13 20:14:19 -04:00
8d7048a902
Fix scattershot rifle charge overlay
2024-04-13 20:14:19 -04:00
97b53dc6a7
Fix cyborg mounted laser icons
2024-04-13 20:14:19 -04:00
842db396c4
Fix SPLURT-specific icon runtimes
2024-04-13 20:10:50 -04:00
42eb876f61
Fix miniature egun overlays
2024-04-13 20:03:56 -04:00
1ccc16cae9
Fix instakill laser rifle overlays
2024-04-13 20:03:55 -04:00
86a97e732a
Fix scattershot rifle charge overlay
2024-04-13 20:03:55 -04:00
160ec104ab
Fix cyborg mounted laser icons
2024-04-13 20:03:55 -04:00
1e1fc329f8
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-04-13 14:12:39 -05:00
2e2528ee56
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-13 00:36:29 -03:00
36bc86cf9c
guns... potat
2024-04-12 23:44:29 -03:00
4af0628c8b
woo
2024-04-12 22:36:44 -03:00
b2e14a5393
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-03-24 17:02:38 -05:00
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
8516b07eee
please do not end your paths with /
2024-03-13 14:43:40 -03:00
676cb864b1
missed proc refs
2024-03-12 22:17:30 -03:00
a65f323734
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
2024-03-08 19:10:22 -03:00
d1b0e9ec9f
Merge remote-tracking branch 'upstream/master'
2024-03-01 21:15:28 -05:00
1a0a313225
Fix borgs, fix ssd_mob_list removal
2024-02-10 21:42:20 +01:00
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
7eaef36e11
d k daunkey kaung
2024-01-03 22:42:03 -03:00
13cd269788
Merge remote-tracking branch 'upstream/master'
2023-12-25 14:28:51 -05:00
be37603291
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-23 13:28:41 -03:00
7b62dbe7bb
ai + mech
2023-12-17 23:15:59 -03:00
c1c9fef224
Merge remote-tracking branch 'upstream/master'
2023-12-15 18:12:47 -05:00
8cdb82a23f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-12 22:06:13 -03:00
c36105ef88
holy hell
2023-12-07 23:08:17 -03:00
a558377206
more stuff i can't guarantee works by itself yet
2023-11-29 23:37:15 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
e3d1286cb8
Merge remote-tracking branch 'upstream/master'
2023-11-23 17:23:16 -05:00
c519c1e128
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-11-21 15:00:51 -03:00
5dc2241d6a
Syndicate Skinned Box Station ( #15580 )
...
* Syndicate Skinned Box Station
* Create syndicatestation.json
Okay tHIS FIXED IT I THINK HOLY CRAP THIS WAS AN EXPERIENCE. HERES THE JSON!
* actually makes this work
* random runtime
we lvoe lesser-used items with runtiming actions
---------
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2023-11-13 12:48:38 +01:00
0c4fbe0914
Add diagonal bayonet and adds it to hunting rifle
2023-09-13 22:06:44 +02:00
Mosley