BongaTheProto
ffcca5c46b
Merge remote-tracking branch 'upstream/master'
2022-02-08 01:16:02 -05:00
SandPoot
7523279254
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-07 22:07:59 -03:00
silicons
af6e43c595
refactors clickcatchers/parallax/fullsceren ( #15460 )
...
* :)
* that
* move those there
* refactor that too
* wew
* stuff
* almost.
* sigh
* just need speed
* stuf
* pain
* hm
* tweaks
* that
* eh
* wack
* a
* done
* that's important
* wacky
* all that
* fixes
* typo
* that
* a
* funny
* that
* that
* woo
* help im losing my fucking mind
* okay
* fix
2022-02-07 15:17:24 -08:00
BongaTheProto
9ce527e068
Merge remote-tracking branch 'upstream/master'
2022-01-26 00:20:29 -05:00
SandPoot
e8c8d2b0ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-25 11:38:07 -03:00
BongaTheProto
e60c7fc091
oops! All splurt
...
mmm module
2022-01-23 15:15:37 -05:00
James
d11316bfc1
Adds crafted bombs to grief warning system and other optimisations
2022-01-06 20:37:34 +00:00
LetterN
fab4b07be5
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-12-21 07:59:33 +08:00
BongaTheProto
11e44ad701
Merge branch 'Sandstorm-Station:master' into master
2021-12-20 18:43:07 -05:00
SandPoot
0fe14f40a9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-12-20 12:29:55 -03:00
silicons
03e8c32acd
Merge pull request #15402 from Linzolle/pinremoval
...
finally change pin removal from crafting to tools
2021-12-19 18:54:50 -08:00
BongaTheProto
f3aec6cb79
Merge remote-tracking branch 'upstream/master'
2021-12-11 15:20:50 -05:00
SandPoot
7b34851794
Adds functionality to dressers once again ( #209 )
2021-12-11 16:52:48 -03:00
BongaTheProto
d99c468053
Merge branch 'Sandstorm-Station:master' into master
2021-12-11 12:49:56 -05:00
SandPoot
67719f786d
Sanity is now visible around your mood ( #208 )
2021-12-11 14:46:47 -03:00
Putnam3145
629ce5bea6
Station traits
2021-12-08 16:17:35 -08:00
BongaTheProto
32c6947194
Merge remote-tracking branch 'upstream/master'
2021-12-05 01:32:13 -05:00
SandPoot
eaa34333b0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-12-05 02:36:59 -03:00
DeltaFire
e576962ac3
e
2021-12-03 18:29:13 +01:00
StrangeWeirdKitten
196cebff53
Merge branch 'master' into Lewd-Clothes
2021-12-02 20:14:16 -07:00
BongaTheProto
0d64b959aa
Merge branch 'pr/25'
2021-12-01 02:34:40 -05:00
SandPoot
ece8b2fbf6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-30 17:43:13 -03:00
Lin
5dc9704e5d
Merge pull request #15380 from DeltaFire15/oops-all-wounds
...
Block & Pellet wound pass
2021-11-30 20:24:42 +00:00
StrangeWeirdKitten
e61495c3c4
Mind Collar
2021-11-30 12:14:07 -07:00
E
c64a5e72f8
boh nerf
2021-11-30 14:03:04 +01:00
Linzolle
9807a2f9e0
pin removal and gun examine things
2021-11-29 17:22:13 -07:00
SandPoot
ed053988d8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-24 22:11:23 -03:00
Lin
e3a5391250
Merge pull request #14868 from Arturlang/admin_mapsave
...
buildmode mapgen tool save [ready]
2021-11-24 17:32:48 +00:00
LetterN
41e5034005
i forgot about this component. Lavaland should have sounds now
2021-11-22 14:18:46 +08:00
LetterN
8dcfea5817
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-21 10:34:14 +08:00
SandPoot
2f8bfa8667
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-20 01:38:26 -03:00
Lin
43e4c71d04
Merge pull request #15384 from SandPoot/acid-bgone
...
Acid overlay no longer lingers after done
2021-11-19 23:02:49 +00:00
Artur
99dedb54ed
Merge remote-tracking branch 'upstream/master' into admin_mapsave
2021-11-20 00:16:56 +02:00
SandPoot
9d3857c94e
Upload files
2021-11-18 14:57:19 -03:00
SandPoot
34900425aa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-17 13:48:32 -03:00
DeltaFire
ef9c90d512
embeds, unarmed and wounds
2021-11-16 20:26:38 +01:00
DeltaFire
6aa906395c
not a gaius reference
...
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
LetterN
8b16653744
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-12 08:50:23 +08:00
SandPoot
3da59fc38c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-05 14:27:17 -03:00
SandPoot
f1f6ac0109
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-31 22:14:23 -03:00
silicons
a32eabb7ae
fix
2021-10-29 22:44:01 -07:00
LetterN
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
LetterN
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
LetterN
49940c373e
tgui backend
2021-10-28 12:51:31 +08:00
Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
SandPoot
32a6e63698
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 23:11:54 -03:00
SandPoot
13d7a166fe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-27 13:54:49 -03:00
SandPoot
e5badd2e09
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 13:31:55 -03:00
Artur
bfcdf83e55
buildmode mapgen tool save
2021-10-26 16:31:36 +03:00
WanderingFox95
4b13d1772c
[Ready] Bone Anvil and processable Bone ingots ( #15290 )
...
* Adding all the extra stuff
* whoops, slipped my last fix in here.
* bone balance
* 6 Goliaths + 3 Watchers + 1 Legion
* bumps the damage modifier down to 1.05
* More Bones.
* Undoes the undoing of the other fix PR
Co-authored-by: Emily <null>
2021-10-25 18:11:54 +02:00
