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 |
|
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 |
|
zerothebigboy
|
3c60632312
|
spiteful
|
2021-09-14 11:01:20 -04: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
|
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
|
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 |
|
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 |
|
zerothebigboy
|
e53223a149
|
unversioned
|
2021-09-02 23:50:38 -04:00 |
|
zerothebigboy
|
ccfde52b0d
|
code
|
2021-09-02 23:45:03 -04:00 |
|
zerothebigboy
|
30134a0d2f
|
cool
|
2021-09-01 06:32:33 -04:00 |
|
zerothebigboy
|
fe90ea3ef4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into headass
|
2021-09-01 05:14:27 -04:00 |
|
zerothebigboy
|
0e95e1a8ad
|
cool
|
2021-09-01 05:14:17 -04:00 |
|
silicons
|
d427c43b7b
|
Merge pull request #15032 from keronshb/itemhighlight
Ports Inventory Outlines
|
2021-08-26 21:41:25 -07:00 |
|
keronshb
|
47078e9a85
|
Ports Hair Gradiants
|
2021-08-26 11:58:09 -04:00 |
|
keronshb
|
e7b6c9ab5e
|
Catwalk Flooring
|
2021-08-22 22:41:48 -04:00 |
|
keronshb
|
bfd805737f
|
Fixes mousentered
|
2021-08-22 12:06:40 -04:00 |
|
keronshb
|
7070a848b6
|
Item Highlight Port
|
2021-08-22 00:21:06 -04:00 |
|
zerothebigboy
|
06181f51ae
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# code/modules/ninja/suit/suit.dm
|
2021-08-19 21:55:22 -04:00 |
|
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 |
|
Artur
|
977d129de6
|
Shuttle lights are back on
|
2021-07-30 23:45:55 +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 |
|
Artur
|
cdbd585f4d
|
update_appearance
|
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 |
|
Lin
|
0066fc6755
|
Merge pull request #14959 from Citadel-Station-13/table-floodfills
rewrites subtler_around_table to be slightly cleaner and (probably) work?
|
2021-07-25 13:56:35 -07:00 |
|
Artur
|
2adfbea215
|
Merge remote-tracking branch 'origin/master' into fake_blood
|
2021-07-23 18:50:09 +03:00 |
|
Lin
|
01ed21bb92
|
Merge pull request #14874 from Citadel-Station-13/silicons-patch-41
slight baton powercreep tweak (5 --> 3.5 seconds rmb cooldown, 35 --> 40 damage)
|
2021-07-22 00:53:53 -07:00 |
|
silicons
|
224fb7f22c
|
Update tables_racks.dm
|
2021-07-21 21:34:10 -07:00 |
|
silicons
|
d38a775a16
|
Update tables_racks.dm
|
2021-07-21 21:33:46 -07:00 |
|
silicons
|
16622ac95a
|
Update tables_racks.dm
|
2021-07-20 18:06:49 -07: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 |
|
silicons
|
89d0c590e6
|
Merge pull request #14943 from WanderingFox95/WanderingFox95-custom-kegs
Custom Kegs
|
2021-07-18 15:06:30 -07:00 |
|
silicons
|
5895eb0d31
|
Merge pull request #14926 from YakumoChen/human-leather-hats
Human leather hats
|
2021-07-18 15:06:22 -07:00 |
|