shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,781 Commits 5 Branches 0 Tags
ab12f2eef9fb1c3642e4e95ffbeddeb2d6339a13
Commit Graph

1215 Commits

Author SHA1 Message Date
LetterN
958b0ef583 dupe defines bad 2022-01-11 10:01:35 +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
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
LetterN
fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
Lin
e506bc50dc Merge pull request #15335 from DeltaFire15/synth-chem-time 
Synth / IPC kinda-buffs - Chemwarfare Edition
 2021-12-01 00:39:02 +00:00
LetterN
fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) 2021-11-16 16:10:12 +08:00
DeltaFire
b4e6b0785d chemscan 
chemscanning (reads: health analyzers mostly) show reagents in grey if not processable due to being invalid
 2021-11-12 19:38:10 +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
silicons
c11d769388 Update _lists.dm 2021-11-09 20:17:34 -07:00
silicons
a32eabb7ae fix 2021-10-29 22:44:01 -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
LetterN
49940c373e tgui backend 2021-10-28 12:51:31 +08:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08: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
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
keronshb
65d2bf3d33 Better round end report 2021-09-30 19:00:00 -04:00
keronshb
fa193aabfa End Report threat 2021-09-30 14:43:13 -04:00
keronshb
792dc073b3 Final fixes? 2021-09-16 13:28:34 -04:00
keronshb
4eaeccf8d8 Fixes more errors 2021-09-15 15:25:26 -04:00
keronshb
7ed5f622f4 Dynamic 2021-09-14 19:33:17 -04:00
silicons
4836f222d0 Merge pull request #15097 from LetterN/generic-housekeeping-pr 
Generic syncs
 2021-09-10 00:16:25 -07:00
silicons
69bd477a72 Merge pull request #15039 from keronshb/gradiantport 
Ports Colorist Quirk and Hair Gradients Preferences
 2021-09-08 20:41:00 -07:00
LetterN
688c8b8a90 what an idiot. properly fixes eco out at roundend 2021-09-08 11:06:13 +08:00
LetterN
d08cd16752 fix 2021-09-08 10:56:20 +08:00
LetterN
12ae614833 fix1 2021-09-08 10:22:55 +08:00
keronshb
47078e9a85 Ports Hair Gradiants 2021-08-26 11:58:09 -04:00
keronshb
1b43c5b1ae Merge remote-tracking branch 'upstream/master' into gremlinport 2021-08-17 09:03:09 -04:00
keronshb
45aed7a218 Gremlins 2021-08-15 23:48:24 -04:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates 
Ports update appearance
 2021-08-08 04:06:18 -07:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur
3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
Putnam3145
95d2adb996 a bunch of async and waitfor 2021-07-25 19:51:27 -07:00
Putnam3145
664c2a0a83 better erroring when auxtools not found 2021-07-25 17:10:07 -07:00
keronshb
c7d1c9d8e8 Ports Stripping log when dc'd 2021-07-07 21:12:44 -04:00
silicons
ea6b0a4ed9 Update do_after.dm 2021-07-04 10:50:49 -07:00
Lin
0bfb671f4e Merge pull request #14482 from silicons/combat_v7 
Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.
 2021-06-27 13:04:29 -07:00
silicons
f119081798 let's make this work 2021-06-15 12:03:34 -07:00
silicons
b04a580e1d it works 2021-06-13 22:19:06 -07:00
silicons
e7f5f80fb1 yelling 2021-06-13 15:34:47 -07:00
silicons
e84f7ae4ac fix 2021-06-13 01:16:44 -07:00
silicons
b6bb20842f Yelling works 2021-06-13 00:50:00 -07:00
Putnam
571a25c052 Finished the first auxgm expansion 2021-06-11 16:15:00 -07:00
silicons
2f9492945d sigh 2021-06-07 19:45:58 -07:00
silicons
1a800cc470 modifications 2021-06-07 19:40:16 -07:00
silicons
b3382a8fe2 local testing time 2021-06-07 16:49:27 -07:00
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
Putnam
e580c504fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-05-21 18:52:16 -07:00
timothyteakettle
34869215e8 Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-14 01:59:32 +01:00