shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,316 Commits 5 Branches 0 Tags
3a2a9997bd4c02e313ffca2c9902b0eaefce4b4c
Commit Graph

1113 Commits

Author SHA1 Message Date
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
Delams-The-SM
52abbbf247 Fixes matrix color radomisation in /proc/randomize_human (#13599) 2020-10-25 13:07:46 +01:00
Tupinambis
3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05:00
silicons
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
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
silicons
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 Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01: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
Timothy Teakettle
1d943a34ef heterochromia 2020-08-28 18:30:28 +01: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
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
Putnam
81dc6c7ee5 Ports reftracking from TG. 2020-08-18 20:41:43 -07:00
Letter N
fa7b82694d src.islazy = TRUE 2020-08-19 10:04:56 +08:00
Letter N
b59d449a75 Update adminhelp.dm 2020-08-19 09:59:41 +08:00
silicons
d2f5c6688b Merge pull request #13084 from Putnam3145/ic-wording-fix 
Made IC issue wording less salt-assuming
 2020-08-09 05:41:10 -07:00
silicons
3068accd2b Merge pull request #13082 from Putnam3145/anaphro 
Removed (an)aphrodisiacs.
 2020-08-09 05:39:56 -07:00
Putnam
9dcfceb8e9 Made IC issue wording less assuming-salt 2020-08-08 01:32:18 -07:00
Putnam
467f66b2a6 Removed crocin/hexacrocin. 2020-08-08 00:46:30 -07:00
Putnam
9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
Timothy Teakettle
289c186f32 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-08-02 18:11:07 +01:00
Unknown
16722c47c3 CentCom Galactic Ban DB 2020-07-29 21:39:58 -05:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Lin
a5dd08a054 Merge pull request #12734 from silicons/shoelaces 
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
 2020-07-28 21:51:43 -05:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
timothyteakettle
3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
timothyteakettle
315e7e1f99 bugfixes 2020-07-24 23:49:15 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons
1f25c7f06d Merge remote-tracking branch 'citadel/master' into shoelaces 2020-07-23 16:23:34 -07:00
Lin
7352e21877 Merge pull request #12844 from Citadel-Station-13/silicons-patch-41 
fixes traitor jobban link
 2020-07-23 13:19:25 -05:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
6e08865b36 Update topic.dm 2020-07-20 17:30:35 -07:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
silicons
a7144d2404 Merge pull request #12829 from timothyteakettle/fried-component 
the fried component
 2020-07-20 16:59:36 -07:00
Lin
f0df3689dc Merge pull request #12790 from Citadel-Station-13/silicons-patch-30 
truncates sdql2 output to 2500 objects instead of 20000 because it's a real epic gamer moment when admins crash their clients doing SELECT /datum/gas_mixture
 2020-07-20 18:20:27 -05:00
silicons
416b989e12 changes 2020-07-20 11:35:10 -07:00
Timothy Teakettle
b06948bed4 fry smite 2020-07-20 17:48:37 +01:00