BongaTheProto
2d1d665e41
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit c1c9fef2246767f48e82
2023-12-16 10:48:35 -05:00
BongaTheProto
c1c9fef224
Merge remote-tracking branch 'upstream/master'
2023-12-15 18:12:47 -05:00
BongaTheProto and GitHub
bb458c8cc1
Merge pull request #1014 from Yawet330/secfix2
...
yippee - I spent 2 hours looking for security exploits
2023-12-13 22:44:13 -05:00
SandPoot
8cdb82a23f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-12 22:06:13 -03:00
deathride58 and GitHub
3e45c18ab4
Merge pull request #16038 from SandPoot/fix-lava+borgs
...
Deals with lava plus a lot of borg stuff
2023-12-12 19:25:13 -05:00
deathride58 and GitHub
4e39bef762
Merge pull request #16040 from SandPoot/better-countdown-effect
...
Makes countdown objects follow their targets better
2023-12-12 19:21:51 -05:00
deathride58 and GitHub
e729badcd2
Merge pull request #16039 from SandPoot/maptexts-(verb)-maptexts-(variable)
...
Maptext()s the maptexts
2023-12-12 19:21:17 -05:00
SandPoot
f95f776547
push
2023-12-11 18:30:19 -03:00
SandPoot
e457f40328
maptext
2023-12-11 17:43:24 -03:00
SandPoot
36f3edaf4c
push
2023-12-10 15:16:51 -03:00
SandPoot
d7942e1365
button
2023-12-10 00:50:10 -03:00
SandPoot
c36105ef88
holy hell
2023-12-07 23:08:17 -03:00
BongaTheProto and GitHub
5fa6d54bb1
Update code/game/objects/structures/crates_lockers/closets/genpop.dm
2023-12-04 14:56:42 -05:00
BongaTheProto and GitHub
fce4ddfbea
Update code/game/objects/structures/crates_lockers/closets/genpop.dm
2023-12-04 14:56:36 -05:00
Yawet330
2325928610
yippee
2023-11-29 16:49:36 +00:00
ariaworld
2288ab9df1
Merge remote-tracking branch 'upstream/master' into spooktober-update
2023-11-25 01:16:38 +01:00
BongaTheProto
e3d1286cb8
Merge remote-tracking branch 'upstream/master'
2023-11-23 17:23:16 -05:00
SandPoot
c519c1e128
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-11-21 15:00:51 -03:00
ariaworld
3805388363
Modularize, RAHHHH!
2023-11-19 03:03:30 +01:00
ariaworld
7bc56f700b
Add: New lines for linters.
2023-11-18 18:29:50 +01:00
ariaworld and GitHub
d10a773e3f
Merge branch 'SPLURT-Station:master' into spooktober-update
2023-11-18 15:01:21 +01:00
ariaworld
e98019e91e
Push, push, push.
2023-11-17 21:34:27 +01:00
silicons and GitHub
9f7685d65c
Merge pull request #16028 from DeltaFire15/powernet-optim
...
Minor power_change optimization (updated)
2023-11-17 12:25:47 -08:00
9c4792ea80
Some dynamic midround tweaking ( #15841 )
...
* midround wizard, blob
* make dynamic respect midround pref, too
* Makes attempt_replacement not just make traitors
* Tried to make it poll if you wanna be a wizard
* something is going to happen in 1 minutes
* i left it half finished!
* This one seems a bit over the top
---------
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2023-11-13 13:00:04 +01:00
DeltaFire
7bb6d4ca08
another layer
2023-11-13 11:46:21 +01:00
DeltaFire
6da3776558
no sleep
...
no sleeping if not using INVOKE_ASYNC
2023-11-13 11:40:42 +01:00
DeltaFire
7d734b11c2
Merge remote-tracking branch 'upstream/master' into powernet-optim
2023-11-13 11:38:50 +01:00
ariaworld
23f141965e
First draft.
2023-10-31 14:03:34 +01:00
MysteryMan21333
06153ae98f
Xenobiology V1.0
2023-10-14 07:15:46 -05:00
BlueWildrose and GitHub
def4b38a46
Revert "[DNM] Updates firemanning, throwing stuff"
2023-10-11 13:52:03 -06:00
BongaTheProto
cd026aaddb
Merge remote-tracking branch 'upstream/master'
2023-10-05 13:38:12 -05:00
SandPoot and GitHub
c3735c05ac
Merge branch 'master' into throwing-updat
2023-10-04 15:15:15 -03:00
SandPoot
5a90dabd3c
stuff
2023-10-03 23:22:57 -03:00
SandPoot
da9d3f1ba0
Merge commit 'af33de25b4732bf6234304bb3cee88c81e65538a' of https://github.com/Citadel-Station-13/Citadel-Station-13 into pr/SmiLeYre/346
2023-10-03 18:57:44 -03:00
Lin and GitHub
bae4216c20
Merge pull request #16003 from SandPoot/held-plushies
...
Adds held sprites to plushes
2023-10-03 17:51:26 -04:00
SandPoot
af33de25b4
the commit
2023-10-03 14:22:05 -03:00
BongaTheProto and GitHub
872b687de2
Merge branch 'Sandstorm-Station:master' into master
2023-10-02 21:01:43 -05:00
SandPoot
cd12c202c4
updates, modularizing and generally making the code better
2023-10-02 22:53:21 -03:00
Марк
e8c0eaa1c1
Plushies.
2023-10-03 04:04:54 +05:00
SandPoot
5945726d63
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-10-02 15:21:26 -03:00
SandPoot
a034a96fc2
part 2
2023-10-02 13:54:40 -03:00
BongaTheProto
085bb06e94
Merge remote-tracking branch 'upstream/master'
2023-09-16 14:32:38 -05:00
SandPoot
0b04af4b76
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-09-14 22:32:47 -03:00
silicons and GitHub
98c0f38de3
Merge pull request #15999 from SandPoot/do_after
...
Implements timed_action_flags for do_after-like procs
2023-09-14 17:59:55 -07:00
SandPoot
51bf703ca7
no
2023-09-09 15:56:48 -03:00
SandPoot
3c7e79d384
do after update
2023-09-09 15:39:49 -03:00
BongaTheProto
be96b4ea72
updates to workflows
...
idk if this will fix the issue
2023-09-03 20:06:32 -05:00
BongaTheProto
fb1dc86226
Merge remote-tracking branch 'upstream/master'
2023-09-03 18:06:53 -05:00
SandPoot
f53a7a1f40
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-09-03 17:47:27 -03:00
Tsurupeta
214f0eb6ef
no message
2023-08-19 14:20:44 +03:00
BongaTheProto