cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,291 Commits 55 Branches 0 Tags
54641ce2015f632b07e09f065abc119f677b7fed
Commit Graph

360 Commits

Author SHA1 Message Date
shellspeed1
cdb1fbb1e2 port of https://github.com/tgstation/tgstation/pull/54029/files# Aka this is where we get bounty cubes and remove the public bounty console. Credit to ArcaneMusic. 2022-09-18 21:55:10 -07:00
shellspeed1
3dace329be adds public bounty consoles without inflation, also removes the mint 2022-09-17 19:27:40 -07:00
Putnam3145
6bb103e3dc unf***s job code (oh well) 2022-08-27 19:16:04 -07:00
silicons
27c404abd2 Update security_officer.dm 2022-08-21 03:13:47 -07:00
silicons
5a32c5ec40 Update security_officer.dm 2022-08-20 13:07:53 -07:00
silicons
b49c1c49e5 Update security_officer.dm 2022-08-20 12:32:37 -07:00
silicons
1f5f6ce699 Merge pull request #15760 from Hatterhat/skill-issue 
skill mod shuffle pr + implied complaining about why dont they reflect the actual skill xp levels themselves
 2022-08-20 12:26:46 -07:00
Hatterhat
36b73da81b i hate tgui i hate tgui i hate tgui 2022-08-06 15:03:33 -05:00
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
73d39db3c1 Merge pull request #15343 from SandPoot/deadmin-prefs 
Ports Automatic Deadminning from TG
 2022-04-15 17:44:55 -07:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03: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
SandPoot
e9637bb688 Merge branch 'master' into deadmin-prefs 2022-03-22 15:35:46 -03:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
SandPoot
52a8fe276b Update files 2022-02-15 18:27:33 -03:00
Putnam3145
07c5f8910f as a funny, also makes alcohol tolerants less likely to be hungover 2021-12-08 17:33:26 -08:00
Putnam3145
43b216707d linter woes, + disables hangover for now 2021-12-08 17:26:40 -08:00
Putnam3145
629ce5bea6 Station traits 2021-12-08 16:17:35 -08:00
SandPoot
80dce37eb4 Upload files 2021-11-06 15:38:13 -03:00
deathride58
34e6187add Merge pull request #15148 from Citadel-Station-13/silicons-patch-1 
disables prisoners
 2021-10-24 22:02:27 -04: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
silicons
dad0f5c207 Merge branch 'master' into silicons-patch-1 2021-10-06 07:21:45 -07:00
silicons
d6e7a096e6 Merge pull request #15206 from zeroisthebiggay/metaprison 
meta station prison remapping
 2021-09-28 00:13:13 -07:00
Lin
a084733397 Merge pull request #15179 from Citadel-Station-13/why 
adds policy configs for elite fauna and prisoner role
 2021-09-20 23:58:21 -05:00
zerothebigboy
9b3d8ab01e wowihatemapping 2021-09-20 14:30:44 -04:00
keronshb
c8814e8cc8 Merge remote-tracking branch 'upstream/master' into dynamicport 2021-09-19 18:09:18 -04:00
keronshb
13323d2597 Merge branch 'master' into dynamicport 2021-09-19 17:59:09 -04:00
silicons
849dbc7fb3 sigh 2021-09-18 19:37:24 -07:00
keronshb
792dc073b3 Final fixes? 2021-09-16 13:28:34 -04:00
zeroisthebiggay
13e110ac43 Update prisoner.dm 2021-09-16 12:03:46 -04:00
silicons
7c918d0f79 Update prisoner.dm 2021-09-14 15:11:58 -07:00
zerothebigboy
68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
zerothebigboy
3c23a09b56 bannedforbeingcringeist 2021-09-07 21:10:24 -04:00
zerothebigboy
e53223a149 unversioned 2021-09-02 23:50:38 -04:00
zerothebigboy
ccfde52b0d code 2021-09-02 23:45:03 -04:00
zerothebigboy
30134a0d2f cool 2021-09-01 06:32:33 -04:00
qweq12yt
d2f11206bf changes to HoP access 
he couldn't access cargo already, now it's just polished so they don't have weird cargo access that they can't use
 2021-06-19 03:15:41 -03:00
qweq12yt
8481c41087 qm can announce to station 2021-06-19 03:15:38 -03:00
Suicidalpickles
6496b418d4 Update paramedic.dm 2021-03-08 18:31:34 -08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Letter N
de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Letter N
125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
necromanceranne
6650d3518a Mostly ports tgstation #54644; New roboticist labcoat sprites 2021-01-04 20:45:11 +11:00
Letter N
cd5d558fad safety? what's that? 
* maybe table-breaking change
 2021-01-04 11:57:12 +08:00
Letter N
56789c5924 firsthit-lib_machines 2020-12-31 16:46:40 +08:00
Letter N
51143f89e5 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-29 10:37:06 +08:00
silicons
92b2177316 Update _job.dm 2020-12-26 11:35:09 -07:00
Letter N
e9ca58446c Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-23 12:25:24 +08:00
silicons
eaa5070870 Update _job.dm 2020-12-22 20:36:06 -07:00