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 |
|
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 |
|
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
|
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 |
|
MrJWhit
|
a324701730
|
Revert "adds cat meteors"
|
2021-06-13 05:25:02 -04:00 |
|
silicons
|
b6bb20842f
|
Yelling works
|
2021-06-13 00:50:00 -07:00 |
|
zerothebigboy
|
e757f9ea2c
|
thetwentythirdofmany
|
2021-06-12 17:41:09 -04:00 |
|
silicons
|
8feb473e65
|
fixes
|
2021-06-12 04:49:23 -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 |
|
zerothebigboy
|
39d951a4a8
|
thesixthofmany
|
2021-06-11 18:24:29 -04:00 |
|
qweq12yt
|
0ca61af62a
|
fixed combo lockers
|
2021-06-10 16:50:44 -03:00 |
|
Putnam
|
3b25f3e199
|
Started expanding auxgm a bit
|
2021-06-10 04:40:23 -07: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
|
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
|
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
|
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
|
a7781f77fd
|
Merge pull request #14802 from bunny232/atmosfoam
Atmos resin buff? fix?
|
2021-06-09 11:15:56 -07:00 |
|
silicons
|
259aed7903
|
Merge pull request #14783 from DeltaFire15/spec-species-color
Colors species names depending on traits
|
2021-06-09 11:14:48 -07:00 |
|
silicons
|
fe8323f503
|
Merge pull request #14747 from keronshb/reinforcedplasmawindowsteps
Adds more deconstruction steps to stronger windows.
|
2021-06-09 11:13:13 -07:00 |
|
silicons
|
716c2a04e4
|
Merge pull request #14160 from keronshb/motivation
Adds a new traitor item, Motivation (Part 1)
|
2021-06-09 11:10:17 -07:00 |
|
Putnam
|
86177c51c4
|
auxgm part 1
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
|
2021-06-08 09:54:28 -07:00 |
|
Putnam
|
fcd1ec83cc
|
removed redundant check
|
2021-06-08 00:25:31 -07:00 |
|
Putnam
|
f6e08a8d2a
|
include a message too
|
2021-06-08 00:24:54 -07:00 |
|
Putnam
|
a236357ebe
|
makes medihound sleeper toggle do something
|
2021-06-08 00:21:19 -07:00 |
|
silicons
|
1a800cc470
|
modifications
|
2021-06-07 19:40:16 -07:00 |
|
silicons
|
40f2c06f2e
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-07 16:47:11 -07:00 |
|
Putnam
|
d03bf641dd
|
extreme optimization project to maybe fix game
|
2021-06-06 21:58:24 -07:00 |
|
bunny232
|
7826ced174
|
Update effects_foam.dm
|
2021-06-06 12:54:07 -04:00 |
|
MrJWhit
|
2db540aae3
|
Update holodeck.dm
|
2021-06-04 20:53:34 -04:00 |
|
Lin
|
a31c99e361
|
Merge pull request #14786 from Arturlang/fixes_float
Fixes float()
|
2021-06-04 12:13:36 -05:00 |
|
Artur
|
f631879b88
|
fixes_float
|
2021-06-02 14:27:22 +03:00 |
|
DeltaFire
|
dd33371a3b
|
colors
|
2021-06-01 22:48:57 +02:00 |
|
silicons
|
cb52be5dd9
|
fixes linter warnings (#14778)
* woo
* woo
|
2021-05-31 10:19:20 -05:00 |
|
Putnam
|
1c17570ea8
|
works but leaks
|
2021-05-30 00:28:51 -07:00 |
|
zerothebigboy
|
8b9763a6a1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
|
2021-05-28 15:42:58 -04:00 |
|