 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 |
|
|
silicons
|
8feb473e65
|
fixes
|
2021-06-12 04:49:23 -07:00 |
|
|
silicons
|
55e8d67521
|
refactor a bit
|
2021-06-12 04:41:58 -07:00 |
|
|
silicons
|
85b1125c83
|
fix
|
2021-06-12 04:36:02 -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 |
|
|
zerothebigboy
|
4486b08bd4
|
thefifteenthofmany
|
2021-06-11 19:33:51 -04:00 |
|
|
Putnam
|
78cf3463ba
|
Updates to master
Closes #14823
|
2021-06-11 16:29:04 -07: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 |
|
|
zerothebigboy
|
8a5a5ef6cc
|
thethirteenthofmany
|
2021-06-11 19:22:05 -04: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 |
|
|
zerothebigboy
|
39d951a4a8
|
thesixthofmany
|
2021-06-11 18:24:29 -04:00 |
|
|
Timothy Teakettle
|
e78929cde1
|
typo
|
2021-06-11 17:55:38 +01: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 |
|
|
zeroisthebiggay
|
c6a70b9a4e
|
Update weaponry.dm
|
2021-06-09 18:37:11 -04: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 |
|
|
keronshb
|
33affb4f10
|
THREE SECONDS
|
2021-06-09 15:14:07 -04:00 |
|
|
keronshb
|
ed929dda12
|
Changes up the animation a bit
|
2021-06-09 15:12:22 -04: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 |
|
|
silicons
|
996a99b7f4
|
Merge pull request #14759 from Arturlang/uplink_misc_item_rebalances
Changes the cost of the holoparasite injector and the ricochet eyepatch
|
2021-06-09 11:21:12 -07:00 |
|
|
silicons
|
a56ac3ce07
|
Merge pull request #14749 from DrPainis/patch-14
adds goliath calamari (currently untested because Forget™)
|
2021-06-09 11:20:49 -07:00 |
|
|
silicons
|
30e7939e0e
|
Merge pull request #14771 from keronshb/disposalcargo
Lets the Cargo Shuttle use Disposal Pipes again
|
2021-06-09 11:19:40 -07:00 |
|
|
silicons
|
564a3aaa4b
|
Merge pull request #14796 from MrJWhit/the-pr-that-gets-people-pissed
Moves medical holodeck to restricted
|
2021-06-09 11:18:32 -07:00 |
|
|
silicons
|
b28d4f26f3
|
Merge pull request #14803 from bunny232/airmixies
21/79 not 20/80
|
2021-06-09 11:18:10 -07:00 |
|