c80d65df73
Merge branch 'master' into familyport
2021-10-28 14:34:20 -04:00
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
6b23d177c8
Merge remote-tracking branch 'upstream/master'
2021-10-15 19:25:41 -04:00
13140f9bb9
Somewhat fixed huds and stuff, not 100%
2021-10-14 16:36:18 -04:00
6331ced3e5
The rest of the offering stuff
2021-10-13 22:13:33 -04:00
e2ab532de2
Removes old gangs, families is almost ready
2021-10-12 16:34:27 -04:00
bd7a2b6a2a
Lets families compile
2021-10-12 16:12:38 -04:00
41013ec815
Part 2 - Missing stuff from original families port
2021-10-12 12:07:02 -04:00
0bae06adcd
Original Port
2021-10-11 22:00:54 -04:00
e5f66413c8
fat dart
...
no idea what this even is
2021-10-08 17:28:25 -04:00
fedf409a5d
Merge pull request #15105 from Citadel-Station-13/silicons-patch-7
...
comedically controversial stunbaton """"buff""""
2021-10-07 00:05:45 -07:00
8be5dba86a
Merge pull request #15127 from Citadel-Station-13/silicons-patch-14
...
chaplain runspeed holy weapon will now only give a random slowdown/speedup of 6 tiles which for the most part ignores all other slowdowns/speedups, instead of randomizing between slowing to a crawl and running faster than the speed of light
2021-10-07 00:05:24 -07:00
76fa85e683
Cyborg module sorting fixed ( #15241 )
2021-10-06 17:16:10 +02:00
8f9a2b6d0c
Merge pull request #15235 from silicons/pai_radio_Stuff
...
redoes how pai emp silencing works
2021-10-05 12:32:23 -07:00
b18fbe695a
Merge pull request #15233 from SandPoot/misc-fixes
...
Some random fixes
2021-10-05 10:27:19 -07:00
bac7bc3fb6
fix
2021-10-03 11:29:32 -07:00
1c80169f22
Update shields.dm
2021-10-02 22:35:54 -03:00
95b814d47e
Upload files
2021-10-02 22:29:01 -03:00
83987db48a
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-10-01 18:51:46 +02:00
5ff4a2ace5
Merge pull request #15180 from LetterN/achives-
...
Achivement & Clowncar update
2021-09-28 00:15:52 -07:00
d8aa29a16e
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-21 14:49:15 +02:00
ab7b4e3eec
Merge pull request #15181 from Citadel-Station-13/typecaches
...
no more powergaming dice bags
2021-09-20 23:59:53 -05:00
c99df01c87
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-20 00:16:27 +02:00
fe8a652689
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-19 21:32:03 +02:00
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
8d914571e8
Merge pull request #15094 from zeroisthebiggay/patch-20
...
removes building (fortnite) windows
2021-09-19 11:09:55 -07:00
a40acd3cd6
Merge pull request #15176 from buffyuwu/dogborgsleeper
...
fixes dogborg sleepers not working
2021-09-19 11:09:06 -07:00
147903f654
sigh
2021-09-19 10:57:58 -07:00
0b7e514739
t
2021-09-19 14:05:28 +08:00
b9b8e32860
fixes dogborg sleepers not working
...
closes #15142
2021-09-18 05:29:42 -04:00
3c60632312
spiteful
2021-09-14 11:01:20 -04:00
d2f3ff4d11
Update holy_weapons.dm
2021-09-12 20:23:00 -07:00
57b6946fbb
Update holy_weapons.dm
2021-09-12 20:18:48 -07:00
037f466a47
Update holy_weapons.dm
2021-09-12 20:12:31 -07:00
aa7a376dd5
removes DoT
2021-09-12 20:10:01 -07:00
7aae90a360
Update holy_weapons.dm
2021-09-12 20:05:47 -07:00
baa8d26428
Update holy_weapons.dm
2021-09-12 20:03:26 -07:00
c038529677
Update holy_weapons.dm
2021-09-12 19:55:20 -07:00
68e2eb1d7a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
2021-09-10 12:12:57 -04:00
c600fae409
Merge pull request #15103 from SandPoot/cyborg-grippers
...
Does some nice stuff on cyborg grippers
2021-09-09 17:59:47 -07:00
52029c6067
Update stunbaton.dm
2021-09-08 20:53:52 -07:00
5bf71cdcc8
Update stunbaton.dm
2021-09-08 20:43:10 -07:00
69bd477a72
Merge pull request #15039 from keronshb/gradiantport
...
Ports Colorist Quirk and Hair Gradients Preferences
2021-09-08 20:41:00 -07:00
37e2470616
Upload files
2021-09-08 19:53:47 -03:00
3c23a09b56
bannedforbeingcringeist
2021-09-07 21:10:24 -04:00
70b0dad62d
Update glass.dm
2021-09-07 03:26:39 -04:00
e53223a149
unversioned
2021-09-02 23:50:38 -04:00
ccfde52b0d
code
2021-09-02 23:45:03 -04:00
30134a0d2f
cool
2021-09-01 06:32:33 -04:00
fe90ea3ef4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into headass
2021-09-01 05:14:27 -04:00
keronshb