SandPoot
7eaef36e11
d k daunkey kaung
2024-01-03 22:42:03 -03:00
SandPoot
20d80858b6
solve minor issues real quick
2023-12-31 15:53:38 -03:00
deathride58
9217fcc7dc
Merge pull request #16043 from SandPoot/stacks
...
Make stacks show how much there are in inventory
2023-12-29 22:57:38 -05:00
SandPoot
272879367f
solution for numerical display bags
2023-12-30 00:31:57 -03:00
deathride58
c95f60c37b
Merge pull request #16034 from BlueWildrose/TransRightsAreHumanRights
...
Adds decal patterns to LGBT holidays + Pansexual and Panromantic Awareness Day holiday
2023-12-29 22:05:37 -05:00
SandPoot
6733de69bd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stacks
2023-12-29 23:16:11 -03:00
SandPoot
2ab6c62ee6
prevent hit
2023-12-29 23:07:24 -03:00
deathride58
ce1d757159
Merge pull request #16016 from SandPoot/throwing-update
...
[TESTMERGE] Updates firemanning, throwing stuff
2023-12-28 22:44:59 -05:00
SandPoot
2585c545fa
not necessary
2023-12-28 00:37:23 -03:00
SandPoot
b9a422ee2d
throw at mobs laying down
2023-12-18 14:07:25 -03:00
SandPoot
653b767f32
remove antags for borging...
2023-12-17 23:35:51 -03:00
SandPoot
27bdd4b732
aiModule > ai_module
2023-12-17 23:20:43 -03:00
SandPoot
7b62dbe7bb
ai + mech
2023-12-17 23:15:59 -03:00
SandPoot
7533d51ae4
is_cyborg
2023-12-13 13:07:10 -03:00
SandPoot
f626df9d1d
push
2023-12-13 00:08:58 -03:00
deathride58
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
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
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
c36105ef88
holy hell
2023-12-07 23:08:17 -03:00
silicons
9f7685d65c
Merge pull request #16028 from DeltaFire15/powernet-optim
...
Minor power_change optimization (updated)
2023-11-17 12:25:47 -08:00
BlueWildrose
8e72f5e7c4
code for patterns
2023-11-16 16:32:48 -07:00
Putnam3145
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
SandPoot
b36da8f5d7
Revert "Revert "[DNM] Updates firemanning, throwing stuff""
...
This reverts commit def4b38a46 .
2023-10-12 14:34:02 -03:00
BlueWildrose
def4b38a46
Revert "[DNM] Updates firemanning, throwing stuff"
2023-10-11 13:52:03 -06:00
SandPoot
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
Lin
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
SandPoot
a034a96fc2
part 2
2023-10-02 13:54:40 -03:00
silicons
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
Katherine Kiefer
16a490ee5c
update auxmos
2023-08-18 22:13:30 +10:00
SandPoot
9421423ed5
Merge branch 'master' into changeling-update
2023-07-26 22:22:14 -03:00
SandPoot
11aa13e4e8
part 1 - 41928
2023-07-26 21:45:43 -03:00
SandPoot
86cc2c0b0d
must return
2023-07-19 20:57:09 -03:00
SandPoot
19ee7f8bd2
some hints
2023-07-19 20:51:25 -03:00
Lin
3c3f609541
Merge pull request #15989 from SandPoot/screentip-update
...
Update screentips
2023-07-19 15:53:38 -05:00
SandPoot
217e23fc7f
push
2023-07-18 15:22:24 -03:00
Jerry Wester
31e87bc2d7
Safeguard suit
2023-05-01 00:26:56 -05:00
Jerry Wester
22309324dc
whitespace should not be syntax grrr
2023-05-01 00:23:09 -05:00
Jerry Wester
8271cf9bc1
move rescue plating to CMO locker
2023-05-01 00:22:59 -05:00
Jerry Wester
44c029176c
remove signals_atom_movable.dm, revert jetpack
2023-05-01 00:19:48 -05:00
KrissKr0ss
66aa1cb05c
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
...
This reverts commit 48e713ff33 , reversing
changes made to efb2d19cb9 .
2023-05-01 00:16:20 -05:00
SandPoot
a1ab60fd07
push
2023-04-08 22:47:48 -03:00