ariaworld
e98019e91e
Push, push, push.
2023-11-17 21:34:27 +01:00
miguelop1
cd2a1f9120
Detective_access_fix
2023-07-24 17:15:27 +01:00
BongaTheProto
5116acad15
Merge remote-tracking branch 'upstream/master'
2023-05-06 18:31:55 -05:00
SandPoot
7038059ab5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-05-06 10:47:06 -03:00
zeroisthebiggay and GitHub
266e5892f0
Update assistant.dm
2023-02-21 05:21:09 -05:00
BongaTheProto
d08cb554e9
Merge branch 'master' into pr/660
2023-02-13 14:09:17 -05:00
BongaTheProto
ce464a6903
Merge remote-tracking branch 'upstream/master'
2023-02-11 21:25:29 -05:00
SandPoot
b62b5c3e12
fix more alt titles
2023-02-11 14:02:22 -03:00
BongaTheProto
2eccd56e6b
Merge branch 'master' into pr/660
2023-02-03 19:48:12 -05:00
BongaTheProto
9e9f9915fa
Merge remote-tracking branch 'upstream/master'
2023-02-03 17:23:22 -05:00
SandPoot
996e472f80
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-03 18:53:29 -03:00
zerothebigboy
d93dcf5b76
sickkicks
2023-02-01 08:25:30 -05:00
BongaTheProto
8a53e33271
Merge branch 'master' into pr/660
2023-01-28 22:11:29 -05:00
BongaTheProto
21c3abdfb7
Merge remote-tracking branch 'upstream/master'
2023-01-18 04:20:45 -05:00
SandPoot
e76ed6a1ea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-17 22:26:56 -03:00
Darius
d90fa375e1
Move heirloom lists to relevant files
...
Port of the current TG heirloom system.
Heirlooms are now stored in job_types and species_types instead of a global list. Items used as heirlooms match their modern TG counterparts when possible.
Also fixes the ancient first aid kit, which is used for a heirloom.
2023-01-04 13:57:54 -05:00
Neyusha
580bd31e12
Stowaways Role
2022-12-27 11:45:20 +03:00
BongaTheProto
963aeb7e11
Merge remote-tracking branch 'upstream/master'
2022-12-06 21:22:29 -05:00
8eec99b320
Caches GetJobName. Fuck you ( #274 )
...
* Caches GetJobName. Fuck you
This code made me deeply upset, WHY IS IT RECURSIVE WHY WHY WHY WHY WHY WHY WHY WHY WHY WHY WHY
* Centcom handling, properly this time
* Empties out real_job_name
* Sets real_job_name up in the right place
* Moves real_job_name to SSjob, uses modularTM
* Yeet
* Removes old code, swaps over to the SSjob list
* dme changes
* indents... comments
Co-authored-by: SandPoot <enric_gabirel@hotmail.com >
2022-12-06 17:09:36 -03:00
zerothebigboy
fbd3971969
okay
2022-10-17 20:05:44 -04:00
BongaTheProto
79fa770ab3
Merge remote-tracking branch 'upstream/master'
2022-10-13 11:21:32 -05:00
SandPoot
5384cb9d4b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-10-12 22:25:25 -03:00
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
BongaTheProto
b287251261
Merge remote-tracking branch 'upstream/master'
2022-08-31 19:46:05 -05:00
SandPoot
d9b51fa748
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-31 19:39:24 -03:00
Putnam3145
6bb103e3dc
unf***s job code (oh well)
2022-08-27 19:16:04 -07:00
BongaTheProto
fb66dc2035
Merge remote-tracking branch 'upstream/master'
2022-08-23 20:30:19 -05:00
SandPoot
32535e69b6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-23 18:31:23 -03:00
silicons and GitHub
27c404abd2
Update security_officer.dm
2022-08-21 03:13:47 -07:00
BongaTheProto
3341812b44
Merge remote-tracking branch 'upstream/master'
2022-08-20 17:16:19 -05:00
SandPoot
550db1b6ee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-20 17:27:19 -03:00
silicons and GitHub
5a32c5ec40
Update security_officer.dm
2022-08-20 13:07:53 -07:00
silicons and GitHub
b49c1c49e5
Update security_officer.dm
2022-08-20 12:32:37 -07:00
silicons and GitHub
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
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
Hatterhat
36b73da81b
i hate tgui i hate tgui i hate tgui
2022-08-06 15:03:33 -05:00
AshTheDerg and GitHub
d96fb1c9d8
Peacekeeper Redo
2022-06-10 23:50:09 -04: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
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
silicons and GitHub
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
radar651
0febabe867
Final fixes?
...
Hopefully
2022-03-26 15:31:46 -05:00
SandPoot and GitHub
e9637bb688
Merge branch 'master' into deadmin-prefs
2022-03-22 15:35:46 -03:00
BongaTheProto
03704d916b
forgor
...
Man i wish i knew how to modularly edit global procs, It would be so easy to add these up but there's no fucking way that I know of
2022-03-19 14:25:50 -05:00
BongaTheProto
bdcbb08719
Psycho
...
https://github.com/quotefox/Hyper-Station-13/pull/1046
https://github.com/Citadel-Station-13/Citadel-Station-13/pull/11180 (mostly used this one to guide myself on adding it, idk why it was removed from the commit in first place)
2022-03-19 12:27:04 -05:00
ariaworld