silicons
|
f024318810
|
Merge pull request #14958 from WanderingFox95/WanderingFox95-TribalOverhaul
Tribal Crafting Overhauled & Expanded
|
2021-10-03 11:20:55 -07:00 |
|
silicons
|
31467420d7
|
Merge pull request #15221 from SandPoot/colormate
Colormate tgui + minor tgui updates
|
2021-10-03 08:51:51 -07:00 |
|
WanderingFox95
|
83987db48a
|
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
|
2021-10-01 18:51:46 +02:00 |
|
Putnam3145
|
a0a9089ce0
|
Removes "play on same board" from minesweeper (#15217)
|
2021-09-29 18:52:05 +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 |
|
Jordan Brown
|
2db0511d0d
|
Removes a dead var
|
2021-09-27 12:20:37 -04:00 |
|
WanderingFox95
|
d8aa29a16e
|
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
|
2021-09-21 14:49:15 +02:00 |
|
Lin
|
ab7b4e3eec
|
Merge pull request #15181 from Citadel-Station-13/typecaches
no more powergaming dice bags
|
2021-09-20 23:59:53 -05:00 |
|
Lin
|
7a5e748344
|
Merge pull request #15185 from Citadel-Station-13/silicons-patch-6
fixes airlock deflection
|
2021-09-20 23:53:53 -05:00 |
|
WanderingFox95
|
c99df01c87
|
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
|
2021-09-20 00:16:27 +02:00 |
|
silicons
|
6d99bca184
|
Update obj_defense.dm
|
2021-09-19 14:46:09 -07:00 |
|
silicons
|
84a26eeabd
|
Update obj_defense.dm
|
2021-09-19 14:45:24 -07: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 |
|
silicons
|
8d914571e8
|
Merge pull request #15094 from zeroisthebiggay/patch-20
removes building (fortnite) windows
|
2021-09-19 11:09:55 -07:00 |
|
silicons
|
a40acd3cd6
|
Merge pull request #15176 from buffyuwu/dogborgsleeper
fixes dogborg sleepers not working
|
2021-09-19 11:09:06 -07:00 |
|
silicons
|
1c22d85061
|
Merge pull request #15158 from SandPoot/obscured-slots
Adds obscured slots and TRAIT_NODROP checks to the outline system
|
2021-09-19 11:07:08 -07:00 |
|
silicons
|
e50125ca6b
|
Merge pull request #15150 from Putnam3145/hacked-law-self-qdel
Makes special objective items delete on reroll
|
2021-09-19 11:06:29 -07:00 |
|
silicons
|
c04f0cb953
|
Merge pull request #15154 from qweq12yt/test
[Fix] Fixes Space Heater behavior
|
2021-09-19 11:06:15 -07:00 |
|
silicons
|
147903f654
|
sigh
|
2021-09-19 10:57:58 -07:00 |
|
LetterN
|
0b7e514739
|
t
|
2021-09-19 14:05:28 +08:00 |
|
buffyuwu
|
b9b8e32860
|
fixes dogborg sleepers not working
closes #15142
|
2021-09-18 05:29:42 -04:00 |
|
SandPoot
|
382473eb88
|
Thicc
|
2021-09-17 14:15:39 -03:00 |
|
SandPoot
|
f61c505bbf
|
Glued items too
|
2021-09-16 01:37:05 -03:00 |
|
SandPoot
|
456f68b32b
|
Upload files
|
2021-09-16 01:05:28 -03:00 |
|
qweq12yt
|
781a414c38
|
fix space heaters
|
2021-09-15 18:16:04 -03:00 |
|
Putnam3145
|
cd9b5fb7d8
|
Makes special objective items delete on reroll
|
2021-09-14 14:34:41 -07:00 |
|
zerothebigboy
|
3c60632312
|
spiteful
|
2021-09-14 11:01:20 -04:00 |
|
Lin
|
d536d22100
|
Merge pull request #15109 from Citadel-Station-13/silicons-patch-11
fixes airlocks not unshocking themselves
|
2021-09-14 01:09:22 -05:00 |
|
Lin
|
4cdee473a4
|
Merge pull request #15132 from Citadel-Station-13/silicons-patch-17
[03:37:30] Runtime in recycler.dm, line 185: Cannot execute null.forceMove().
|
2021-09-14 01:08:15 -05:00 |
|
silicons
|
ac0fd70b0b
|
Update misc_floor.dm (#15140)
|
2021-09-14 02:24:15 +02:00 |
|
silicons
|
85659a297f
|
Merge pull request #15071 from Putnam3145/remove-bomb-research-cap
Remove arbitrary bomb research cap + tweak formula a little
|
2021-09-13 15:09:28 -07:00 |
|
silicons
|
fcac5fa3c0
|
Update recycler.dm
|
2021-09-12 20:40:25 -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
|
4836f222d0
|
Merge pull request #15097 from LetterN/generic-housekeeping-pr
Generic syncs
|
2021-09-10 00:16:25 -07:00 |
|
silicons
|
c600fae409
|
Merge pull request #15103 from SandPoot/cyborg-grippers
Does some nice stuff on cyborg grippers
|
2021-09-09 17:59:47 -07:00 |
|
silicons
|
a8d9a38d18
|
Update airlock.dm
|
2021-09-09 17:58:47 -07:00 |
|
silicons
|
d72d05485a
|
Update airlock.dm
|
2021-09-09 03:34:02 -07:00 |
|
keronshb
|
4f54c465b2
|
ReebeReturns (#15056)
|
2021-09-09 06:17:00 +02: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 |
|
silicons
|
bb7ee63eae
|
Merge pull request #15058 from zeroisthebiggay/headass
the unatomized hypospray/medbay tools/emergency kits resprite
|
2021-09-08 20:40:20 -07:00 |
|
SandPoot
|
37e2470616
|
Upload files
|
2021-09-08 19:53:47 -03:00 |
|
LetterN
|
1ba8f25410
|
byond no likey :(
|
2021-09-08 10:35:41 +08:00 |
|
zerothebigboy
|
3c23a09b56
|
bannedforbeingcringeist
|
2021-09-07 21:10:24 -04:00 |
|
zeroisthebiggay
|
70b0dad62d
|
Update glass.dm
|
2021-09-07 03:26:39 -04:00 |
|
silicons
|
11b07e3ddc
|
Merge pull request #15083 from keronshb/outlinefix
FIX Ghosts can no longer highlight your inventory
|
2021-09-07 00:07:03 -07:00 |
|
keronshb
|
5a0782e97c
|
ACTUAL OBSERVER FIX
|
2021-09-05 21:34:33 -04:00 |
|
keronshb
|
ea3b248e6c
|
Ports Parade outfit changes
|
2021-09-05 14:17:52 -04:00 |
|
Putnam3145
|
845786a81a
|
Actually, 5000 is the new point
|
2021-09-02 21:10:11 -07:00 |
|