 siliconsandGitHub
|
46baf7372d
|
Update permissionedit.dm
|
2020-11-25 22:47:25 -07:00 |
|
|
SandPoot
|
84e93d4134
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-11-20 19:47:06 -03:00 |
|
|
uomo91
|
cfaa988217
|
Merge master and fix newline conflict.
|
2020-11-19 17:12:19 -06:00 |
|
|
siliconsandGitHub
|
f8d43b7544
|
Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
|
2020-11-18 22:54:51 -07:00 |
|
|
SandPoot
|
af0f6e7bd0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-11-18 23:12:54 -03:00 |
|
|
Putnam3145andGitHub
|
9d300ade35
|
Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
|
2020-11-18 17:50:38 -08:00 |
|
|
uomo91
|
6b85ab5c01
|
Individual logging code.
|
2020-11-16 01:40:48 -06:00 |
|
|
DeltaFire
|
3e19557e8f
|
and more fixes.
|
2020-11-14 19:38:39 +01:00 |
|
|
DeltaFire
|
152a57be77
|
and another
|
2020-11-14 19:31:26 +01:00 |
|
|
SandPoot
|
c66ae014ef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-11-13 14:49:27 -03:00 |
|
|
silicons
|
803bff4e5f
|
funny
|
2020-11-12 23:34:42 -07:00 |
|
|
DeltaFire
|
76fe1a77bc
|
Merge remote-tracking branch 'upstream/master' into system-corruption
|
2020-11-13 01:00:50 +01:00 |
|
|
Artur
|
503d0156c6
|
Does the thing
|
2020-11-08 23:24:58 +02:00 |
|
|
DeltaFire
|
f1178a65a0
|
admin edit thingy
admins can edit both normal toxdamage and corruption
|
2020-11-01 22:04:28 +01:00 |
|
|
Putnam
|
3c4eff605d
|
broken but compiles and runs sans panics
|
2020-10-28 23:07:59 -07:00 |
|
|
SandPoot
|
3ead0dde53
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-10-25 11:58:18 -03:00 |
|
|
Delams-The-SMandGitHub
|
52abbbf247
|
Fixes matrix color radomisation in /proc/randomize_human (#13599)
|
2020-10-25 13:07:46 +01:00 |
|
|
siliconsandGitHub
|
6c7b34748b
|
Update sql_message_system.dm
|
2020-10-12 12:32:37 -07:00 |
|
|
siliconsandGitHub
|
30b711aecb
|
Update sql_message_system.dm
|
2020-10-12 02:38:43 -07:00 |
|
|
SandPoot
|
4c73583f75
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-10-11 21:30:33 -03:00 |
|
|
TupinambisandGitHub
|
3224533a7c
|
Merge branch 'master' into spooder
|
2020-10-11 14:31:23 -05:00 |
|
|
SandPoot
|
273ad286d5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-10-10 14:43:38 -03:00 |
|
|
|
19f1e99a8c
|
mass ports like 15 tg prs + counting (#13386)
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
|
2020-10-10 12:20:33 +02:00 |
|
|
silicons
|
8e83dcd697
|
event permissions
|
2020-10-07 14:43:53 -07:00 |
|
|
SandPoot
|
08f8360f31
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-10-06 23:10:33 -03:00 |
|
|
Letter N
|
47845f2c30
|
suposed to be SSupdates but noo
|
2020-10-03 19:54:23 +08:00 |
|
|
Tupinambis
|
d2860b38c7
|
normalization
|
2020-10-01 18:46:31 -05:00 |
|
|
Tupinambis
|
f1bc1ccafb
|
Merge branch 'master' into spooder
# Conflicts:
# code/modules/surgery/organs/eyes.dm
I have no idea if this will work
|
2020-10-01 17:10:42 -05:00 |
|
|
Enric Gabriel
|
7df07d2859
|
Merge branch 'master' of upstream into master
|
2020-10-01 12:49:01 -03:00 |
|
|
siliconsandGitHub
|
8b36cf6f64
|
Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
|
2020-10-01 03:01:18 -07:00 |
|
|
Tupinambis
|
113b84ab50
|
Ports arachnids from WaspStation
|
2020-09-30 15:10:17 -05:00 |
|
|
Timothy TeakettleandGitHub
|
106b8ccead
|
Merge branch 'master' into heterochromia
|
2020-09-24 22:09:03 +01:00 |
|
|
Enric Gabriel
|
4de9baf690
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-21 14:10:28 -03:00 |
|
|
Artur
|
410550220b
|
Fixed admin hide most verbs
|
2020-09-21 10:39:09 +03:00 |
|
|
Timothy Teakettle
|
58737e42b9
|
empulse using range
|
2020-09-10 19:52:34 +01:00 |
|
|
timothyteakettle
|
e0f44ef717
|
new emps
|
2020-09-10 03:49:47 +01:00 |
|
|
Artur
|
c79e9fbc0b
|
https://github.com/tgstation/tgstation/pull/53263
|
2020-09-02 18:48:09 +03:00 |
|
|
Artur
|
3bef4ba35e
|
TGUI updates + statpanel
|
2020-09-02 17:52:47 +03:00 |
|
|
Enric Gabriel
|
c10471fac9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-30 01:42:29 -03:00 |
|
|
Enric Gabriel
|
6ae97d5991
|
quick little make ip clickable
|
2020-08-29 17:11:25 -03:00 |
|
|
SandPootandGitHub
|
89a55525f5
|
[TESTMERGE] New tgs commands + modification of a existant one (#58)
|
2020-08-29 15:45:02 -03:00 |
|
|
Timothy Teakettle
|
1d943a34ef
|
heterochromia
|
2020-08-28 18:30:28 +01:00 |
|
|
Enric Gabriel
|
f70b74eca3
|
here
|
2020-08-26 12:05:06 -03:00 |
|
|
Letter N
|
57a008d567
|
fixes adminbus
|
2020-08-26 11:22:57 +08:00 |
|
|
Letter N
|
c13a22a841
|
stops kevinz from leaking his IP
|
2020-08-24 18:42:48 +08:00 |
|
|
Letter N
|
b8d812fb47
|
"what if adminbus stops leaking confidential adminchat" and also updates admin things. you can now do obj/structure/singulo:50
|
2020-08-23 17:18:32 +08:00 |
|
|
Letter N
|
271c66ad40
|
travis moment
|
2020-08-22 17:03:10 +08:00 |
|
|
Letter N
|
0b159b218a
|
revert moment
|
2020-08-22 16:30:56 +08:00 |
|
|
Letter N
|
afe32406c0
|
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
|
2020-08-22 13:40:36 +08:00 |
|
|
Enric Gabriel
|
b0cf18fc5a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-20 13:29:24 -03:00 |
|