shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,166 Commits 5 Branches 0 Tags
c4d7d61764ba7d93bae5dddcf661e7c7aacc3611
Commit Graph

3707 Commits

Author SHA1 Message Date
silicons
51dbc8e21f Merge pull request #14685 from Arturlang/fake_blood 
Reworks blood regeneration into something a bit more tame
 2021-08-11 02:54:49 -07:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates 
Ports update appearance
 2021-08-08 04:06:18 -07:00
Artur
5acd7fef2d makes salglu not deadly 2021-08-02 21:54:47 +03:00
silicons
c5438c73be Merge pull request #14879 from WanderingFox95/WanderingFox95-IcemoonRuinsOnLavaland 
[Review/Testmerge] Icemoon Ruins but on Lavaland!
 2021-07-29 22:39:42 -07:00
Artur
4b2bffdff0 Actually makes it work by /obj/screen --> /atom/movable/screen 2021-07-29 14:06:18 +03:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur
30016f38a8 compiles 2021-07-28 02:13:57 +03:00
Artur
3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
Putnam3145
f1560cb807 fixing a bunch of unit test/runtime issues 2021-07-25 18:40:11 -07:00
Artur
2adfbea215 Merge remote-tracking branch 'origin/master' into fake_blood 2021-07-23 18:50:09 +03:00
silicons
3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -07:00
silicons
24c2ab8b8c Merge pull request #14940 from timothyteakettle/trash-eating 
adds a neutral trash eating quirk
 2021-07-18 15:07:29 -07:00
silicons
b0c53fcc57 Merge pull request #14947 from Arturlang/crafting_fixes 
Crafting menu cleaning up
 2021-07-18 15:07:12 -07:00
Lin
4a7e6e5b00 Merge pull request #14945 from timothyteakettle/plant 
fixes photosynthesis stopping nutrition going past well fed from non-photosynthesis means
 2021-07-17 09:50:20 -07:00
Artur
5abace9e8c wrong letter and unneceseary variable 2021-07-16 15:22:49 +03:00
Artur
b71a6497e8 Crafting menu fixes and such 
Fixes crafting buttons making more of themselves on relogs, and cleans some wierd as fuck shit.
 2021-07-16 03:23:02 +03:00
Timothy Teakettle
07fec51d92 fix 2021-07-15 16:44:48 +01:00
timothyteakettle
41759dd163 fix 2021-07-14 18:15:33 +01:00
timothyteakettle
65c40a51f2 trash ELEMENT 2021-07-14 17:17:44 +01:00
timothyteakettle
39c09a60b8 initial commit 2021-07-13 23:45:31 +01:00
Lin
d50eb91632 Merge pull request #14921 from Putnam3145/componentize-acid 
Componentizes acid
 2021-07-13 11:52:43 -07:00
Lin
114df4e717 Merge pull request #14920 from Putnam3145/fix-activity-runtime-again 
Fixes a runtime in activity tracking
 2021-07-12 00:03:53 -07:00
silicons
d0b3857cb6 Merge pull request #14842 from WanderingFox95/WanderingFox95-TheWheelchairPRs 
[Ready] Wheelchair Sprite Rollback + Motorized Hoverchairs
 2021-07-09 16:50:00 -07:00
Putnam3145
899e74fc83 Componentized acid 2021-07-03 22:10:44 -07:00
Putnam3145
e437f6514a Fixes a runtime in activity tracking 2021-07-03 21:09:27 -07:00
Putnam3145
f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07:00
silicons
22ad8f2c8c Merge pull request #14893 from WanderingFox95/WanderingFox95-TheDailyWhiplash 
[Ready] The Daily Whiplash (Newspaper Baton)
 2021-06-29 08:50:48 -07:00
silicons
833a7b958f fix 2021-06-28 13:24:12 -07:00
silicons
0069f12c6f errors 2021-06-28 13:17:14 -07:00
silicons
a5a476f457 cyborg shovies 2021-06-28 13:10:40 -07:00
silicons
a73ca4be46 scope creep lmao 2021-06-28 12:29:18 -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
5204f5a6d9 Merge pull request #13991 from Putnam3145/auxtools-atmos 
Replaces extools with auxtools; atmos overhaul
 2021-06-27 11:01:32 -07:00
silicons
08f251a88c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-27 10:44:51 -07:00
WanderingFox95
eb74ad2137 And a recipe. 
You attach a newspaper to a telebaton with tape.
 2021-06-25 11:39:22 +02:00
WanderingFox95
ed389bc908 BDM Ruin randomizer 2021-06-23 21:22:09 +02:00
WanderingFox95
45bde213c8 Screw it, let's put it THERE. 2021-06-22 17:16:32 +02:00
WanderingFox95
c20f5030d2 This one doesn't spawn, so I'll leave it out for now. 2021-06-22 16:35:48 +02:00
Putnam3145
0f229495d0 aaand i forgot some /proc/s 2021-06-21 20:32:55 -07:00
Putnam3145
fbbae70527 i need to go to bed and this is a LOT 2021-06-21 10:14:50 -07:00
DeltaFire
c7a098da06 suffering (aka, a bunch of fixes) 2021-06-21 19:05:31 +02:00
Putnam3145
c253a2de86 alright how about these 2021-06-21 09:52:54 -07:00
Putnam3145
0bf383a90b does this fix it 2021-06-21 09:18:06 -07:00
WanderingFox95
b64e8200e3 Adds the ruins to the pool. 
Yeah.
 2021-06-21 16:40:04 +02:00
Putnam3145
f77495f45d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-21 02:19:51 -07:00
silicons
3c7786dafd Merge pull request #14734 from keronshb/SpaceDragon 
(READY) Ports Space Dragon Midround Event.
 2021-06-18 20:03:43 -07:00
silicons
4768b23398 Merge pull request #14860 from Arturlang/nanite_updates 
Updates our nanite stuff to TG's, mostly
 2021-06-18 20:01:05 -07:00
Putnam3145
dbdc3001ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-16 23:33:14 -07:00
silicons
c1928c9446 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-16 19:04:16 -07:00
silicons
687d0adf23 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-16 19:04:07 -07:00