Commit Graph

1198 Commits

Author SHA1 Message Date
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
Timothy Teakettle c51fa954cf Update mobs.dm 2021-05-10 14:51:18 +01:00
Timothy Teakettle be9b1ddffb fixes 2021-05-10 14:43:45 +01:00
LetterN 1bee003d49 fixes roundend runtime 2021-05-09 22:48:50 +08:00
Timothy Teakettle 3c7137f951 what if we didnt break 90% of the game 2021-05-05 18:19:02 +01:00
Timothy Teakettle ba71bb944a im not crazy but this commit breaks 90% of the game 2021-05-05 18:11:05 +01:00
silicons 4f73557168 Merge pull request #14647 from SandPoot/limb-grower-tgui
Ports TGUI limb grower from tg
2021-04-28 21:20:01 -06:00
silicons 47489c21d6 Merge remote-tracking branch 'citadel/master' into auxtools-atmos 2021-04-27 00:59:45 -07:00
silicons d547aa7ff1 almost compiling 2021-04-26 23:37:26 -07:00
silicons 1585d1c2be fixes 2021-04-26 23:32:33 -07:00
silicons a415453540 ripping off my own code 2021-04-26 23:29:37 -07:00
silicons eb2c12ceee yell wip 2021-04-26 23:10:10 -07:00
silicons 275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
SandPoot c2b7140ddd upload icons.dm 2021-04-24 21:43:12 -03:00
SandPoot 90661d3687 upload files 2021-04-24 21:37:01 -03:00
SandPoot e6c23728eb upload files 2021-04-23 12:56:11 -03:00
SandPoot 5bb6078def upload files 2021-04-22 20:39:21 -03:00
silicons ef2482c6b0 renders storage objects independently per user (#14545)
* sigh

* sigh

* override

* hah..

* kinda working

* done
2021-04-13 15:16:21 +02:00