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

1106 Commits

Author SHA1 Message Date
silicons
a32eabb7ae fix 2021-10-29 22:44:01 -07:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
WanderingFox95
4b13d1772c [Ready] Bone Anvil and processable Bone ingots (#15290) 
* Adding all the extra stuff

* whoops, slipped my last fix in here.

* bone balance

* 6 Goliaths + 3 Watchers + 1 Legion

* bumps the damage modifier down to 1.05

* More Bones.

* Undoes the undoing of the other fix PR

Co-authored-by: Emily <null>
 2021-10-25 18:11:54 +02: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
silicons
f024318810 Merge pull request #14958 from WanderingFox95/WanderingFox95-TribalOverhaul 
Tribal Crafting Overhauled & Expanded
 2021-10-03 11:20:55 -07:00
SandPoot
b23b88524d Upload files 2021-09-28 22:03:17 -03:00
WanderingFox95
fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-19 21:32:03 +02:00
zerothebigboy
5a8a069cd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into intern 
# Conflicts:
#	icons/mob/clothing/suit.dmi
#	icons/mob/clothing/suit_digi.dmi
#	icons/obj/clothing/suits.dmi
 2021-09-09 04:49:30 -04:00
zerothebigboy
9f4f099880 gommit 2021-09-02 03:05:23 -04:00
Cognition
d18e5e7c25 fixes waddling ruining character size 2021-08-27 21:15:37 -07:00
silicons
d427c43b7b Merge pull request #15032 from keronshb/itemhighlight 
Ports Inventory Outlines
 2021-08-26 21:41:25 -07:00
Lin
3f8895e41d Merge pull request #15031 from zeroisthebiggay/patch-16 
undoes more Trillby™ Spelling™
 2021-08-22 13:19:59 -05:00
keronshb
7070a848b6 Item Highlight Port 2021-08-22 00:21:06 -04:00
zeroisthebiggay
7b7541b77e Update glassware.dm 2021-08-21 05:51:02 -04:00
zeroisthebiggay
efc5598263 Update code/datums/components/crafting/glassware/lens_crafting.dm 
Co-authored-by: MarinaGryphon <jadebishop.2562@gmail.com>
 2021-08-20 21:55:54 -04:00
zeroisthebiggay
42964392e3 Update lens_crafting.dm 2021-08-19 23:39:05 -04: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
WanderingFox95
960ce45d29 Adds all the recipes and uncaps them 2021-07-20 18:59:15 +02:00
silicons
3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -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
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
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
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
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
silicons
c1928c9446 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-16 19:04:16 -07:00
WanderingFox95
02bbe70810 This is so the crafting menu doesn't break. My bad. 2021-06-16 23:23:38 +02:00
Lin
1e66357706 Merge pull request #14851 from Vynzill/spritinghell 
Extended Armwraps
 2021-06-16 11:30:01 -07:00
Timothy Teakettle
e12380cc40 Update embedded.dm (#14854) 2021-06-16 19:27:19 +02:00
WanderingFox95
5f4a07ce12 Also I'm a dork and forgot the recipe. 2021-06-16 13:41:15 +02:00
Artur
724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03:00
Vynzill
df72710cae herewego 2021-06-14 17:19:05 -05:00
silicons
8feb473e65 fixes 2021-06-12 04:49:23 -07:00
silicons
55e8d67521 refactor a bit 2021-06-12 04:41:58 -07:00
silicons
85b1125c83 fix 2021-06-12 04:36:02 -07:00
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
silicons
4afb5209a1 Merge pull request #14637 from TheObserver-sys/DerringerPass1 
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
 2021-05-07 18:42:24 -06:00