Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
silicons
a14549d07b
Merge pull request #15299 from Hatterhat/cgau
...
funny hands gaming - adds proto-kinetic gauntlets
2021-10-27 13:36:08 -07: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
Hatterhat
7fb3666f43
funny hands gaming
2021-10-22 22:05:18 -05:00
Putnam3145
136ca1f107
Merge branch 'master' into more-ashwalker-woes
2021-10-18 04:35:57 -07:00
SandPoot
45ef0fe5ca
closes #15278
2021-10-17 21:40:39 -03: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
Putnam3145
3cfaad31c1
Merge pull request #15149 from keronshb/dynamicport
...
(Probably ready for test merge) DYNAMIC 2021
2021-10-07 18:14:59 -07:00
Lin
b92226be17
Merge pull request #15245 from Putnam3145/fix-ashwalkers-one-last-time
...
Another lavaland breathing fix
2021-10-07 11:44:47 -07:00
Putnam3145
fedf409a5d
Merge pull request #15105 from Citadel-Station-13/silicons-patch-7
...
comedically controversial stunbaton """"buff""""
2021-10-07 00:05:45 -07:00
Chayse Ramsay
d1611ddf42
Lavaland ruin rad storm fix ( #15242 )
...
* Lavaland rad storm fix
* whoops
* double whoops
* Update Lavaland.dmm
2021-10-06 17:28:29 +02:00
Putnam3145
8070df6492
whoops
2021-10-05 19:07:52 -07: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
Putnam3145
51f85c58a4
One last ashwalker fix
2021-10-04 20:56:08 -07:00
SandPoot
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
DeltaFire
cd570be827
woo
2021-10-04 15:03:56 +02:00
silicons
f024318810
Merge pull request #14958 from WanderingFox95/WanderingFox95-TribalOverhaul
...
Tribal Crafting Overhauled & Expanded
2021-10-03 11:20:55 -07:00
WanderingFox95
83987db48a
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-10-01 18:51:46 +02:00
SandPoot
b23b88524d
Upload files
2021-09-28 22:03:17 -03:00
silicons
5ff4a2ace5
Merge pull request #15180 from LetterN/achives-
...
Achivement & Clowncar update
2021-09-28 00:15:52 -07:00
silicons
3607bbf363
Merge pull request #15197 from Putnam3145/up-min-lavaland-temp
...
Ups minimum lavaland temperature
2021-09-27 23:31:20 -07:00
WanderingFox95
4e87044845
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-27 18:15:34 +02:00
Putnam3145
c169a0408a
more ashwalker lung adjustments
2021-09-26 13:13:22 -07:00
keronshb
a6bfff92cc
Fixes pirates, re adds extended, re adds voting
2021-09-24 19:40:56 -04:00
zeroisthebiggay
72cb19eb3f
Update space.dm
2021-09-24 19:15:32 -04:00
zeroisthebiggay
c633c95919
Update space.dm
2021-09-24 18:35:49 -04:00
Putnam3145
a4adf41c7c
Ups minimum lavaland temperature
2021-09-22 18:43:45 -07:00
WanderingFox95
c99df01c87
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-20 00:16:27 +02:00
keronshb
c8814e8cc8
Merge remote-tracking branch 'upstream/master' into dynamicport
2021-09-19 18:09:18 -04:00
keronshb
13323d2597
Merge branch 'master' into dynamicport
2021-09-19 17:59:09 -04:00
WanderingFox95
fe8a652689
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-19 21:32:03 +02:00
zerothebigboy
c6ce359cda
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# tgstation.dme
2021-09-19 15:23:52 -04:00
LetterN
0b7e514739
t
2021-09-19 14:05:28 +08:00
Timothy Teakettle
1665a45a5e
expunged
2021-09-17 16:26:22 +01:00
Timothy Teakettle
e2df9fec47
indentation
2021-09-17 12:26:11 +01:00
Timothy Teakettle
1ab63a69c5
Update mild.dm
2021-09-17 12:17:53 +01:00
keronshb
372725c1f4
Fixes everything????
2021-09-16 15:40:21 -04:00
keronshb
792dc073b3
Final fixes?
2021-09-16 13:28:34 -04:00
keronshb
7ed5f622f4
Dynamic
2021-09-14 19:33:17 -04:00
silicons
aa7a376dd5
removes DoT
2021-09-12 20:10:01 -07:00
zerothebigboy
68e2eb1d7a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
2021-09-10 12:12:57 -04:00
silicons
fd785c6abf
Merge pull request #15063 from zeroisthebiggay/intern
...
ports various tg armor resprites and some such
2021-09-10 00:16:54 -07:00
silicons
4836f222d0
Merge pull request #15097 from LetterN/generic-housekeeping-pr
...
Generic syncs
2021-09-10 00:16:25 -07: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
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
aca22e913b
reftrack ae
2021-09-08 10:26:48 +08:00
LetterN
6739e349a0
heretics LOVES this - Also ian's birthday!
2021-09-08 09:50:07 +08:00
LetterN
e203abb25c
generic controller update
2021-09-08 09:10:28 +08:00
zerothebigboy
3c23a09b56
bannedforbeingcringeist
2021-09-07 21:10:24 -04:00
