silicons
|
01e0fa16fe
|
it works.
|
2021-06-14 13:52:48 -07:00 |
|
silicons
|
b04a580e1d
|
it works
|
2021-06-13 22:19:06 -07:00 |
|
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 |
|
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 |
|
silicons
|
a88561d1aa
|
Merge pull request #14770 from keronshb/spaceadaptaura
Changes Space Adapt to a proper animated outline so it doesn't look awful.
|
2021-06-13 15:19:08 -07: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 |
|
silicons
|
b77da2824a
|
Merge pull request #14830 from zeroisthebiggay/dishdrive
TG Resprite Compendium Atomization Project | Episode Five: Dish Drives
|
2021-06-13 15:14:30 -07:00 |
|
silicons
|
211fed05d7
|
Merge pull request #14829 from zeroisthebiggay/singulohammer
TG Resprite Compendium Atomization Project | Episode Four: Singularity Hammers
|
2021-06-13 15:14:04 -07:00 |
|
silicons
|
33d8e95144
|
Merge pull request #14826 from zeroisthebiggay/bankmachine
TG Resprite Compendium Atomization Project | Episode Two: Bank Machines
|
2021-06-13 15:13:46 -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 |
|
zerothebigboy
|
3fae79f876
|
thetwentyfirstofmany
|
2021-06-11 20:28:25 -04:00 |
|
zerothebigboy
|
4486b08bd4
|
thefifteenthofmany
|
2021-06-11 19:33:51 -04:00 |
|
zerothebigboy
|
8a5a5ef6cc
|
thethirteenthofmany
|
2021-06-11 19:22:05 -04:00 |
|
silicons
|
b188a6ea0f
|
why
|
2021-06-11 16:15:31 -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 |
|
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 |
|
SandPoot
|
79c501a7b4
|
upload files
|
2021-06-09 21:36:43 -03: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 |
|
silicons
|
dcd80edf5f
|
Merge pull request #14806 from zeroisthebiggay/patch-11
cuts the amount of essence revenant objective needs in half so it is actually feasibly possible
|
2021-06-09 11:17:52 -07:00 |
|
silicons
|
0ee2892bee
|
Merge pull request #14807 from Putnam3145/make-sleeper-pref-good
makes medihound sleeper toggle do something
|
2021-06-09 11:17:39 -07:00 |
|
silicons
|
7af470efef
|
Merge pull request #14808 from SandPoot/fixes-soulstones
Fixes soulstones runtiming
|
2021-06-09 11:17:25 -07:00 |
|