BongaTheProto
2d1d665e41
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit c1c9fef2246767f48e82
2023-12-16 10:48:35 -05:00
BongaTheProto
5afdd65bdb
Revert "followup"
...
This reverts commit 32b361c846
2023-12-16 10:48:30 -05:00
BongaTheProto
32b361c846
followup
2023-12-15 18:38:06 -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
d71ae369d6
reorganizes flags to be alphabetical
2023-12-11 15:23:53 -03:00
SandPoot
289695d17f
missing arg
2023-12-10 15:26:26 -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
bfc964b76b
do you know the definition of insanity
2023-12-09 20:27:19 -03:00
BongaTheProto and GitHub
6872017f1d
Merge pull request #1009 from ariaworld/spooktober-update
...
[SEMI-MODULAR] Small Spooktober update (In November)
2023-12-08 20:28:44 -05:00
BongaTheProto
700fd57efb
Merge remote-tracking branch 'upstream/master'
2023-12-08 20:22:05 -05:00
SandPoot
c1ec13b1bf
maybe final
2023-12-07 23:55:44 -03:00
SandPoot
c36105ef88
holy hell
2023-12-07 23:08:17 -03:00
SandPoot
ae873bd925
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-06 17:10:38 -03:00
deathride58 and GitHub
a91e0990a2
Merge pull request #16037 from SandPoot/fontawesome
...
Bumps up FontAwesome to 6.1.2
2023-12-06 14:58:31 -05:00
SandPoot
42fdd30ba4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-05 17:47:58 -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
SandPoot
d8572108bd
pissed
2023-12-03 23:37:49 -03:00
ariaworld
7f82de9f49
Merge remote-tracking branch 'upstream/master' into spooktober-update
2023-12-02 23:49:11 +01:00
SandPoot
f698cbb8a7
bump
2023-12-01 14:54:05 -03:00
Yawet330
2325928610
yippee
2023-11-29 16:49:36 +00:00
BlueWildrose and GitHub
9d8b2bc8cb
Merge pull request #16035 from SandPoot/tags
...
Adds Datum Tagging for admins
2023-11-27 20:06:28 -07:00
BongaTheProto and GitHub
0eb8c98b07
Merge pull request #1010 from Satile1/Vox
...
[MODULAR] Vox breathe nitrogen
2023-11-26 20:20:59 -05:00
tgstation-server
6df8c9a9fe
Update TGS DMAPI
2023-11-25 01:06:13 +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
Satile1
a2e02563d4
Voxxie breathe the nitrogens.
2023-11-22 18:28:03 +00:00
SandPoot
b290efc434
push
2023-11-22 14:11:17 -03: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
0c2be63a85
Add: Milk decal + organize stripper outfits.
2023-11-18 17:58:53 +01:00
ariaworld
56f9956fbc
Remove: Accidental code clone.
2023-11-18 17:36:37 +01:00
ariaworld and GitHub
d10a773e3f
Merge branch 'SPLURT-Station:master' into spooktober-update
2023-11-18 15:01:21 +01:00
BongaTheProto and GitHub
161f5a477a
Merge pull request #978 from MysteryMan21333/Xenobiology
...
[NON-MODULAR] Xenobiology V1.0
2023-11-17 23:48:39 -05:00
BongaTheProto and GitHub
460e924f6a
Merge pull request #997 from MysteryMan21333/Ports-Wasteland-Robots
...
[SEMI-MODULAR] [READY] Fallout 13 Cyborg Sprites.
2023-11-17 23:42:48 -05:00
SPLURT-Station
ba2b94b7ba
Update TGS DMAPI
2023-11-18 00:30:26 +00:00
ariaworld
1f463a734c
Merge branch 'spooktober-update' of https://github.com/ariaworld/S.P.L.U.R.T-Station-13 into spooktober-update
2023-11-17 23:26:33 +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
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
BongaTheProto