 silicons
|
8595e05ad9
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-13 15:37:35 -07:00 |
|
|
silicons
|
8224546cfc
|
ok
|
2021-06-13 15:36:20 -07:00 |
|
|
silicons
|
e7f5f80fb1
|
yelling
|
2021-06-13 15:34:47 -07:00 |
|
|
zerothebigboy
|
a64d94a7cc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites
|
2021-06-13 18:25:35 -04:00 |
|
|
silicons
|
49efd115ee
|
Merge pull request #14832 from zeroisthebiggay/miscsprites
TG Resprite Compendium Atomization Project | Episode Seven: Misc. Resprites & Distinctive Combat Defibs
|
2021-06-13 15:24:30 -07:00 |
|
|
silicons
|
a91d5111c4
|
Merge pull request #14837 from zeroisthebiggay/trojancoyoteskirt
(held against my will) adds a onesleeved croptop
|
2021-06-13 15:19:37 -07:00 |
|
|
zerothebigboy
|
bae89fcaba
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites
|
2021-06-13 18:19:01 -04:00 |
|
|
silicons
|
d6aaf5c96a
|
Merge pull request #14824 from timothyteakettle/bee
bees can go in containers and are released upon opening the container
|
2021-06-13 15:18:46 -07:00 |
|
|
silicons
|
d0fc422b3a
|
Merge pull request #14816 from SandPoot/tablet-pen-slot
Adds a pen slot for tablet computers
|
2021-06-13 15:16:37 -07:00 |
|
|
zerothebigboy
|
319e03476b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into miscsprites
|
2021-06-13 18:16:08 -04:00 |
|
|
silicons
|
f56e95e4e7
|
Merge pull request #14841 from MrJWhit/revert-14762-patch-2
Revert "adds cat meteors"
|
2021-06-13 15:15:59 -07:00 |
|
|
silicons
|
2dd0d014b9
|
Merge pull request #14813 from SandPoot/small-issues
Fixes some small issues with cosmetic syndicate clothing (loadout clothing)
|
2021-06-13 15:15:32 -07:00 |
|
|
silicons
|
431acd9d5c
|
Merge pull request #14820 from qweq12yt/more-cargo-stuff
[FIX] Some cargo related fixes
|
2021-06-13 15:15:20 -07:00 |
|
|
Putnam
|
39dbbd0f21
|
Fixed deactivated supermatters eating gas
|
2021-06-13 09:22:43 -07:00 |
|
|
Putnam
|
a9db30d6d9
|
optimization, fix to breath, experimenting with speed
|
2021-06-13 07:31:01 -07:00 |
|
|
MrJWhit
|
a324701730
|
Revert "adds cat meteors"
|
2021-06-13 05:25:02 -04:00 |
|
|
silicons
|
e84f7ae4ac
|
fix
|
2021-06-13 01:16:44 -07:00 |
|
|
silicons
|
5c44cc22f4
|
attempt examinate
|
2021-06-13 00:54:15 -07:00 |
|
|
silicons
|
b6bb20842f
|
Yelling works
|
2021-06-13 00:50:00 -07:00 |
|
|
zerothebigboy
|
a395fc1b52
|
a
|
2021-06-12 19:58:53 -04:00 |
|
|
zerothebigboy
|
e757f9ea2c
|
thetwentythirdofmany
|
2021-06-12 17:41:09 -04:00 |
|
|
silicons
|
2c61a48860
|
Update mark_datum.dm
|
2021-06-12 05:09:13 -07:00 |
|
|
Putnam
|
5b84155ac7
|
makes o2 not just sorta disappear when breathed
|
2021-06-11 19:06:13 -07:00 |
|
|
Putnam
|
bcbcd6bfce
|
aoaoaoao
|
2021-06-11 18:16:47 -07:00 |
|
|
zerothebigboy
|
e0a311435b
|
thetwentysecondofmany
|
2021-06-11 20:53:35 -04:00 |
|
|
zerothebigboy
|
3fae79f876
|
thetwentyfirstofmany
|
2021-06-11 20:28:25 -04:00 |
|
|
zerothebigboy
|
b7eecc315f
|
theeighteenthofmany
|
2021-06-11 19:49:43 -04:00 |
|
|
zerothebigboy
|
53e95b7356
|
theseventeenthofmany
|
2021-06-11 19:48:04 -04:00 |
|
|
Putnam
|
833d34ba8e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-06-11 16:28:12 -07:00 |
|
|
silicons
|
b188a6ea0f
|
why
|
2021-06-11 16:15:31 -07:00 |
|
|
Putnam
|
571a25c052
|
Finished the first auxgm expansion
|
2021-06-11 16:15:00 -07:00 |
|
|
Timothy Teakettle
|
baad78e7fe
|
bee
|
2021-06-11 16:08:55 +01:00 |
|
|
Putnam
|
eda6a4d2e2
|
Aaaa
|
2021-06-11 05:23:24 -07:00 |
|
|
silicons
|
816b09bf32
|
Merge remote-tracking branch 'citadel/master' into backend_sync
|
2021-06-10 22:36:26 -07:00 |
|
|
qweq12yt
|
584dce4a80
|
updating comments
|
2021-06-11 01:34:19 -03:00 |
|
|
BlackMajor
|
86881dc1af
|
Merge pull request #14768 from Citadel-Station-13/silicons-patch-33
makes xenos immune to stamina damage, with something that might be potentially horrifically abusable but isn't really fixable in a clean way yet
|
2021-06-11 12:52:12 +12:00 |
|
|
qweq12yt
|
0ca61af62a
|
fixed combo lockers
|
2021-06-10 16:50:44 -03:00 |
|
|
zerothebigboy
|
1fa4ac60cb
|
i need a nap
|
2021-06-10 15:16:36 -04:00 |
|
|
Putnam
|
3b25f3e199
|
Started expanding auxgm a bit
|
2021-06-10 04:40:23 -07:00 |
|
|
zerothebigboy
|
fa738856bf
|
i need a nap
|
2021-06-10 03:22:34 -04:00 |
|
|
SandPoot
|
79c501a7b4
|
upload files
|
2021-06-09 21:36:43 -03:00 |
|
|
zerothebigboy
|
fba4b1966c
|
painful
|
2021-06-09 18:30:32 -04:00 |
|
|
zerothebigboy
|
190edf57e8
|
painful
|
2021-06-09 18:28:21 -04:00 |
|
|
zerothebigboy
|
1a90c96e4b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# icons/mob/clothing/feet.dmi
# icons/mob/clothing/feet_digi.dmi
# icons/mob/clothing/head.dmi
# icons/mob/clothing/mask.dmi
# icons/mob/clothing/mask_muzzled.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/masks.dmi
# icons/obj/items_and_weapons.dmi
|
2021-06-09 17:40:28 -04:00 |
|
|
silicons
|
5e4f3ed694
|
Merge pull request #14683 from keronshb/shovedisarmgun
Off Balance Disarms only if shoved into a wall or person.
|
2021-06-09 12:14:37 -07:00 |
|
|
SandPoot
|
d70a35a48d
|
upload syndicate.dm
|
2021-06-09 15:49:57 -03:00 |
|
|
silicons
|
09d61c3bec
|
Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon
New Challenger: The Cat Surgeon has appeared! (Ready!)
|
2021-06-09 11:29:24 -07:00 |
|
|
silicons
|
a77aa8bd41
|
Merge pull request #14766 from Linzolle/cultfix
Fix cult area shenanigans, cult can do stuff in maint again.
|
2021-06-09 11:22:26 -07:00 |
|
|
silicons
|
224efa0e26
|
Merge pull request #14762 from DrPainis/patch-2
adds cat meteors
|
2021-06-09 11:21:55 -07:00 |
|
|
silicons
|
eb4b4088f4
|
Merge pull request #14760 from keronshb/floorcluwneport
Ports Floor Cluwnes and Cluwnes.
|
2021-06-09 11:21:22 -07:00 |
|