Sim
50c16ccfad
[PORT] Adds Immersion from tgstation/tgstation/47704
...
Please roleplay appropriately, okay?
Commit can also be called "How I Lost My Entire Playerbase"
2024-10-08 18:29:20 -03:00
Sim
6cbc3a7930
Adds Rejuvenate to the Context Menu
...
faster aheals faster tickets
this one's coded by me
Context Menu is ordered by category so switching it to Debug bumps it up a few spaces.
2024-10-08 16:45:05 -03:00
Sim
c8983e1b03
Did you know Mosley pulls from downstreams without knowing what he pulls?
...
AKA [PORT] Refactors smiting, adds smite build mode tgstation/tgstation#55327
!! NOT!! A!! RUNNING!! BUILD!!
LIGHTNING IS BROKEN
IMMERSE IS COMMENTED OUT
HALF OF THIS SHIT IS BROKEN
DO NOT BASE YOURSELF ON THIS BUILD!!
2024-10-08 01:50:15 -03:00
BongaTheProto and GitHub
78d4eaeaaa
Merge pull request #1135 from liz-lavenza/fix/upstream-merge-fix
...
Fix harddel issues with 515 upgrade PR
2024-04-07 03:16:55 -05:00
Elizabeth Lavenza
3619b3d634
Fix global procs called without GLOBAL_PROC and vice versa
2024-04-07 00:02:34 -04:00
BongaTheProto
2709ec887c
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-04-06 19:06:12 -05:00
SandPoot
7ec9e65dcf
cease those screams
2024-04-05 18:39:33 -03:00
BongaTheProto
327ea3999f
Merge branch 'master' into 515-auxmos
2024-03-31 21:32:01 -05:00
Elizabeth Lavenza
90378d4da9
Fix direct Destroy calls
2024-03-28 18:18:31 -04:00
BongaTheProto
d20caf7191
Merge branch '515-update' into upstream-merge
2024-03-24 17:39:24 -05:00
BongaTheProto
b2e14a5393
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-03-24 17:02:38 -05:00
SandPoot
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
BongaTheProto
1883c47d5c
basic ref regex
...
makes the proc calls compatible with 515
2024-03-11 19:46:05 -05:00
SandPoot
a65f323734
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
2024-03-08 19:10:22 -03:00
BongaTheProto
d1b0e9ec9f
Merge remote-tracking branch 'upstream/master'
2024-03-01 21:15:28 -05:00
SandPoot
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
SandPoot
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
BongaTheProto
13cd269788
Merge remote-tracking branch 'upstream/master'
2023-12-25 14:28:51 -05:00
SandPoot
be37603291
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-23 13:28:41 -03:00
SandPoot
7b62dbe7bb
ai + mech
2023-12-17 23:15:59 -03:00
SandPoot
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
BongaTheProto
7146a5f2eb
Merge remote-tracking branch 'upstream/master'
2023-01-30 17:02:01 -05:00
SandPoot
8ae64b1bd8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-29 19:16:50 -03:00
SandPoot
54641ce201
send
2023-01-23 20:44:28 -03:00
BongaTheProto
a949e5d08c
Merge remote-tracking branch 'upstream/master'
2022-10-28 16:43:28 -05:00
SandPoot
02e4551a27
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-10-25 22:52:45 -03:00
Lin and GitHub
03c62f4359
Merge pull request #15876 from SandPoot/fix-deadchat_broadcast
...
Fixes deadchat_broadcast
2022-10-25 04:36:00 +00:00
SandPoot
24ee6077c7
push changes
2022-10-23 00:18:03 -03: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
e1c822cbd8
TGUI; actually fixes station announcer
2022-08-07 17:17:58 -07:00
James
f771ad67e4
Version 01
2022-07-30 18:07:13 +01:00
BongaTheProto
6ada3f7c94
Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen
2022-04-18 21:36:14 -05:00
SandPoot
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
BongaTheProto
899f66ecc6
Merge branch 'master' into pr/214
2022-02-27 15:16:13 -05:00
BongaTheProto
54aec9bd98
Merge remote-tracking branch 'upstream/master'
2022-02-27 14:38:06 -05:00
SandPoot
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
James
e1ec4b66fd
Some modularisation
2022-02-27 16:02:26 +00:00
James
7932cd7b07
Cleanup 3
2022-02-26 09:59:54 +00:00
James
a5d37e701f
More cleanup
2022-02-26 09:07:58 +00:00
James
d55f509282
Cleanup
2022-02-26 06:42:19 +00:00
James
1038df6983
First page of panel basically done
2022-02-19 17:42:17 +00:00
SandPoot
c42aa2c30a
Upload files
2022-02-15 22:16:07 -03:00
James
560b23592d
More buyable stuff, new teleport gizmo, misc changes
2022-02-01 03:21:15 +00:00
James
a67efdc1fa
TGUI Playtimes Panel
2022-01-05 05:22:53 +00:00
BongaTheProto
fc7c58013b
more hyper stuff
...
- added some hilberts to places
- fixed engineer boxes
- added hyper's punishments
- lightning punishment is funnier now
- added rounded noises from hyper
2022-01-02 02:06:35 -05:00
BongaTheProto
1fd1ae3771
no more clown I hate clown
...
I'll remove the clown job and anything clown related later I swear
2021-12-24 15:13:22 -05:00
James
f3726aba32
Added slave collars, slave console and modified comms console
2021-12-02 17:01:23 +00:00
SandPoot
34900425aa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-17 13:48:32 -03:00
Sim