Putnam3145
33889870c9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-05-17 13:22:40 -07:00
silicons
be5a476aaf
fixes being unable to access own notes ( #15599 )
...
* Update sql_message_system.dm
* not webeditting
Co-authored-by: DeltaFire <andreoxgrievous@gmail.com >
2022-04-16 04:35:56 +02:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
silicons
bfbba7cb06
blocks investigate log access without R_SENSITIVE ( #15573 )
...
* Update admin_verbs.dm
* Update admin_verbs.dm
* Update sql_message_system.dm
2022-03-30 12:42:05 -07:00
Putnam3145
6199aa4d60
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-03-30 12:35:12 -07:00
Lin
ae5896d6cf
Merge pull request #15525 from keronshb/ambitioncheck
...
Ambitions from Skyrat
2022-02-27 02:34:13 +00:00
silicons
bf9afd846d
Merge pull request #15528 from SandPoot/time-to-kill-this-broken-system
...
[PORT] Removes the non bitflag slot defines
2022-02-26 18:08:28 -07:00
silicons
87e58fcc14
Merge pull request #15505 from SandPoot/playertimes-tgui
...
Player Playtime TGUI
2022-02-26 18:08:18 -07:00
SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
keronshb
3ea22f97a6
Merge remote-tracking branch 'upstream/master' into ambitioncheck
2022-02-22 17:10:25 -05:00
SandPoot
c42aa2c30a
Upload files
2022-02-15 22:16:07 -03:00
SandPoot
a3d9dd2c99
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into job-exp-exemption
2022-02-15 18:35:23 -03:00
SandPoot
52a8fe276b
Update files
2022-02-15 18:27:33 -03:00
keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05: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
LetterN
18b7069f1f
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2022-01-11 09:49:38 +08:00
silicons
4de727ce6e
Update SDQL_2.dm ( #15462 )
2022-01-09 16:59:29 +01:00
DeltaFire
2940d141cf
please-dont-smite-us-lummox
2022-01-01 07:10:35 +01:00
SandPoot
8510dcc08a
Ports tgui stripping (finally) ( #15401 )
...
* Upload files
* Update items.dm
* Update files
* Update files
* Update strippable.dm
* Update strippable
* Update strippable.dm
* Upload files
* Update files
* Update files
* Update files
* update files
* Update files
* Update dog.dm
* Update strippable.dm
* Update equipping
* Update strippable.d
* Upload files
* Upload files
* Update monkey.dm
2021-12-30 07:40:15 +01:00
keronshb
83a62ace04
Ambitioncheck
2021-12-23 21:15:31 -05:00
Putnam3145
657b25b501
i forgot i didn't add ammonia yet
2021-12-08 18:05:19 -08:00
Putnam3145
629ce5bea6
Station traits
2021-12-08 16:17:35 -08:00
LetterN
a47a20235f
make possess respect the new audio scheme
2021-11-22 14:20:26 +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
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
keronshb
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04:00
silicons
186b552103
merge
2021-10-29 21:50:58 -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
keronshb
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
keronshb
c80d65df73
Merge branch 'master' into familyport
2021-10-28 14:34:20 -04:00
Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
SandPoot
67c6cc3fc0
tiny fix
2021-10-27 13:48:34 -03:00
SandPoot
45ef0fe5ca
closes #15278
2021-10-17 21:40:39 -03:00
SandPoot
17986fea3f
cannot escape
2021-10-16 14:24:22 -03:00
SandPoot
1561138350
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-16 14:11:00 -03:00
Lin
1f7e65ad01
Merge pull request #15271 from Citadel-Station-13/admin_tickets
...
fixes "answered by <admin>" spam in irc
2021-10-15 23:34:15 -07:00
keronshb
6b23d177c8
Merge remote-tracking branch 'upstream/master'
2021-10-15 19:25:41 -04:00
silicons
d0eade8fe1
fix
2021-10-14 19:20:32 -07:00
keronshb
e2ab532de2
Removes old gangs, families is almost ready
2021-10-12 16:34:27 -04:00
DeltaFire
5680b74294
safety
2021-10-11 20:32:00 +02:00
DeltaFire
66e81e7fda
asay ping time
2021-10-11 19:52:30 +02:00
SandPoot
437b3105d1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-08 21:05:41 -03:00
Putnam3145
3cfaad31c1
Merge pull request #15149 from keronshb/dynamicport
...
(Probably ready for test merge) DYNAMIC 2021
2021-10-07 18:14:59 -07:00
SandPoot
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
silicons
0a75925df9
wack
2021-09-29 06:02:17 -07:00
keronshb
c8814e8cc8
Merge remote-tracking branch 'upstream/master' into dynamicport
2021-09-19 18:09:18 -04:00
zerothebigboy
c6ce359cda
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# tgstation.dme
2021-09-19 15:23:52 -04:00
