 Aypa
|
e837ea991e
|
Merge branch 'master' into esthetic-help
|
2022-08-14 16:54:21 -03:00 |
|
|
WoolyAypa
|
df7fae30c1
|
fuck it, colorful angel wings! >:)
|
2022-08-13 23:12:58 -03:00 |
|
|
BongaTheProto
|
63ff25b599
|
Merge branch 'master' into new-mech
|
2022-08-08 20:17:31 -05:00 |
|
|
BongaTheProto
|
7717cd566c
|
Modularize custom spawntext
old change
|
2022-08-07 22:24:22 -05:00 |
|
|
BongaTheProto
|
9e7c5033cc
|
Merge remote-tracking branch 'upstream/master'
|
2022-08-07 21:42:16 -05:00 |
|
|
SandPoot
|
00dadda3df
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-08-07 23:15:57 -03:00 |
|
|
Putnam3145
|
047c6a2a21
|
removes some duplicate signals
|
2022-08-07 18:00:53 -07:00 |
|
|
Putnam3145
|
b2d816b825
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
|
2022-08-07 17:59:28 -07:00 |
|
|
Putnam3145
|
e1c822cbd8
|
TGUI; actually fixes station announcer
|
2022-08-07 17:17:58 -07:00 |
|
|
LinandGitHub
|
f1bfca20ce
|
Merge pull request #15756 from Putnam3145/supermatter-less-death
Nitric oxide second pass (+ some prettiness stuff in the UI)
|
2022-08-08 00:17:43 +00:00 |
|
|
SandPoot
|
6108e1d522
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-08-07 19:46:26 -03:00 |
|
|
siliconsandGitHub
|
d20fec7422
|
Merge pull request #15754 from LetterN/patch-11
fix signaler app
|
2022-08-06 23:17:53 -07:00 |
|
|
siliconsandGitHub
|
66b96e4b44
|
Merge pull request #15757 from Hatterhat/naming-expansion
crusher UNIQUE_RENAME + 350 chr limit custom descs
|
2022-08-06 23:17:43 -07:00 |
|
|
siliconsandGitHub
|
679c26d35a
|
Merge pull request #15753 from SandPoot/lack-of-eyes
Fixes lack of eyes
|
2022-08-06 23:17:29 -07:00 |
|
|
siliconsandGitHub
|
5846d5fbc1
|
Merge pull request #15751 from Hatterhat/vg-25163-try-2
/vg/station style recoil - screen pushback
|
2022-08-06 23:17:22 -07:00 |
|
|
siliconsandGitHub
|
802afe1df5
|
Merge pull request #15747 from Linzolle/catwalk
fix catwalk overlays not working properly
|
2022-08-06 23:17:03 -07:00 |
|
|
BongaTheProto
|
509b8df511
|
Modularize everything
this seems to be working I thibk
|
2022-08-06 17:35:53 -05:00 |
|
|
BongaTheProto
|
af9ec000a9
|
Merge branch 'master' into new-mech
|
2022-08-06 16:49:32 -05:00 |
|
|
BongaTheProtoandGitHub
|
74797a79be
|
Merge branch 'Sandstorm-Station:master' into master
|
2022-08-05 23:15:43 -05:00 |
|
|
BongaTheProto
|
caf7a4a758
|
Merge branch 'master' into pr/423
|
2022-08-05 17:44:21 -05:00 |
|
|
Hatterhat
|
44b23b873d
|
crusher rename + 350 chr limit descs
|
2022-08-05 17:41:41 -05:00 |
|
|
SandPoot
|
bf0c0f530d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-08-05 19:09:18 -03:00 |
|
|
Putnam3145
|
2337939868
|
Nitrogen stuff second pass
|
2022-08-05 14:48:00 -07:00 |
|
|
Hatterhat
|
959fa45d3c
|
client prefs! per-gun recoil multipliers!
|
2022-08-05 16:00:19 -05:00 |
|
|
LinandGitHub
|
ee24c29ed1
|
Merge pull request #15744 from Putnam3145/untied-shoes-nerf
Some tweaks to untied shoelaces (+ miner boots minor buff)
|
2022-08-04 23:29:19 +00:00 |
|
|
LinandGitHub
|
5d4abd2571
|
Merge pull request #15752 from Hatterhat/l6-rechamber
L6 Rechambering (tg parity, not a balance thing, fixes L6 match ammo)
|
2022-08-04 23:21:00 +00:00 |
|
|
Letter NandGitHub
|
b6d62780c2
|
fix
|
2022-08-04 11:06:16 +08:00 |
|
|
SandPoot
|
449fead213
|
adds a lack of eyes + dmieditor
|
2022-08-03 22:14:25 -03:00 |
|
|
BongaTheProto
|
0563def679
|
Merge remote-tracking branch 'upstream/master'
|
2022-08-03 17:41:43 -05:00 |
|
|
SandPoot
|
3be808e51e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-08-03 18:42:49 -03:00 |
|
|
BongaTheProtoandGitHub
|
bf8b463a08
|
Merge pull request #416 from SPLURT-Station/updates
|
2022-08-03 16:04:50 -05:00 |
|
|
Hatterhat
|
2d405f7bc8
|
nitpicky todo
|
2022-08-03 06:29:22 -05:00 |
|
|
Hatterhat
|
2155a8bdce
|
funny ammo
|
2022-08-03 06:11:04 -05:00 |
|
|
Hatterhat
|
670bda0e29
|
it works
|
2022-08-03 06:01:35 -05:00 |
|
|
Putnam3145
|
8ab1a12ef7
|
i forgot to compile??
|
2022-08-02 23:15:10 -07:00 |
|
|
siliconsandGitHub
|
cb87b004f1
|
Update airlock.dm
|
2022-08-02 23:13:36 -07:00 |
|
|
siliconsandGitHub
|
6aa2967fed
|
Update say.dm
|
2022-08-02 23:07:02 -07:00 |
|
|
siliconsandGitHub
|
5280ae388f
|
Merge pull request #15742 from timothyteakettle/vtuber-ai
lets AIs control status displays (vtuber mode)
|
2022-08-02 23:06:02 -07:00 |
|
|
Linzolle
|
cd1389ae0f
|
fix catwalks
|
2022-08-02 22:59:59 -07:00 |
|
|
Putnam3145
|
0238d9fbe5
|
make it actually do something lol
|
2022-08-02 21:50:56 -07:00 |
|
|
Putnam3145
|
db06dbcd58
|
forgot to commit and push
|
2022-08-02 16:44:05 -07:00 |
|
|
LinandGitHub
|
b1eb485eeb
|
Merge pull request #15741 from Putnam3145/another-minor-bomb-nerf
Another minor bomb points nerf
|
2022-08-02 22:57:23 +00:00 |
|
|
Putnam3145
|
8456caa095
|
Makes untied shoes take lacing difficulty into account
|
2022-08-02 13:28:01 -07:00 |
|
|
LinandGitHub
|
3cb77a2b23
|
Merge pull request #15737 from SandPoot/bitfields
Refactor bitfields global, improve turret_flags debugging
|
2022-08-02 00:24:58 +00:00 |
|
|
LinandGitHub
|
97f775749c
|
Merge pull request #15738 from Citadel-Station-13/silicons-patch-8
fixes parallax scroll angles
|
2022-08-02 00:19:08 +00:00 |
|
|
BongaTheProto
|
9e980f825f
|
Merge remote-tracking branch 'upstream/master'
|
2022-08-01 17:19:36 -05:00 |
|
|
SandPoot
|
105251893d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-08-01 12:45:35 -03:00 |
|
|
SandPoot
|
c7088af077
|
doesn't work
|
2022-08-01 12:44:40 -03:00 |
|
|
Timothy Teakettle
|
e467a0d289
|
offset 2 pixels down so it looks better
|
2022-08-01 13:23:31 +01:00 |
|
|
Timothy Teakettle
|
e87146bf4e
|
debug messages, bug fix
|
2022-08-01 13:17:06 +01:00 |
|