 Ghom
|
e7cf680ca7
|
Merge pull request #10266 from shellspeed1/master
New insect marking customization option and three new wings.
|
2019-12-25 03:43:29 +01:00 |
|
|
Seris02
|
85c5a5dfa1
|
Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass
|
2019-12-24 22:29:46 +08:00 |
|
|
Seris02
|
9e6f0762b7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass
|
2019-12-24 22:27:41 +08:00 |
|
|
Lin
|
a0b90158c4
|
Merge pull request #10269 from Ghommie/Ghommie-cit488
Fix goose meat.
|
2019-12-24 00:56:07 +00:00 |
|
|
Ghom
|
37a6abd889
|
Merge pull request #10274 from kappa-sama/kappa-sama-patch-1
no more 40% time dilation from broodmother
|
2019-12-23 13:41:10 +01:00 |
|
|
Ghom
|
db2a108b4a
|
Merge pull request #10246 from Citadel-Station-13/kevinz000-patch-129
Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag
|
2019-12-23 03:25:27 +01:00 |
|
|
Ghom
|
3635525c56
|
Merge pull request #10210 from Citadel-Station-13/kevinz000-patch-127
Cargo shuttle now silently leaves behind slaughter demons + revenants
|
2019-12-23 03:13:31 +01:00 |
|
|
Ghom
|
f3936f2c81
|
Merge pull request #10093 from Trilbyspaceclone/donut
[Ready] Hey why dont I port that one donut pr? Ye just the one food related pr... Just the one... Oh no
|
2019-12-23 02:31:50 +01:00 |
|
|
kevinz000
|
6157cb0042
|
Merge pull request #10254 from r4d6/patch-1
Fix the nose boop
|
2019-12-22 14:03:02 -08:00 |
|
|
kappa-sama
|
994cd753d5
|
no more 40% time dilation
|
2019-12-22 14:39:36 -05:00 |
|
|
Ghommie
|
757af250cf
|
Fix goose meat.
|
2019-12-22 12:21:11 +01:00 |
|
|
kevinz000
|
f39d12527d
|
Update supply.dm
|
2019-12-21 23:50:59 -08:00 |
|
|
shellspeed1
|
1875ea3f58
|
new wings and fluff
|
2019-12-21 23:47:41 -08:00 |
|
|
TrilbySpaceClone
|
c7dbdd73df
|
Merge branch 'master' into donut
|
2019-12-22 02:36:57 -05:00 |
|
|
Trilbyspaceclone
|
f5a55aaecf
|
Nerfs fun
|
2019-12-21 21:09:22 -05:00 |
|
|
Lin
|
37a0f0d7e6
|
Merge pull request #10241 from Ghommie/Ghommie-cit482
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly
|
2019-12-21 22:44:09 +00:00 |
|
|
kevinz000
|
86074ae6b1
|
lowered to 10 after i struggled to open tickets panel
|
2019-12-21 14:33:02 -08:00 |
|
|
Ghom
|
6b2fe333f4
|
Merge pull request #9830 from DeltaFire15/cbt-clockvsbloodtorture
Stun warfare rebalance - CBT edition
|
2019-12-21 19:02:00 +01:00 |
|
|
Ghom
|
a33065a728
|
Merge pull request #10190 from Trilbyspaceclone/honeysoda
The new buzz around the new soft drink
|
2019-12-21 18:34:35 +01:00 |
|
|
Ghom
|
2b2a3c2721
|
Merge pull request #9950 from Citadel-Station-13/marauder-nerf-1
Nerfs the Clockwork Marauder meta
|
2019-12-21 17:26:04 +01:00 |
|
|
Ghom
|
2bc401e2d2
|
Merge pull request #10096 from Citadel-Station-13/kevinz000-patch-123
nanites can no longer spread through atmospherics-blocking objects
|
2019-12-21 16:48:56 +01:00 |
|
|
Ghom
|
2a76743747
|
I'm playing dirty because we have too many PRs to merge anyway.
|
2019-12-21 16:42:27 +01:00 |
|
|
Ghom
|
5c3d3f4cc5
|
Is merging someone else's PR you personally fixed considerable as self-merging?
|
2019-12-21 16:40:32 +01:00 |
|
|
Ghom
|
daf099388e
|
Unnecessary OOC note.
|
2019-12-21 16:37:28 +01:00 |
|
|
Ghom
|
4624a1739a
|
typo
|
2019-12-21 16:30:02 +01:00 |
|
|
Ghom
|
aea2b8865e
|
Merge pull request #10120 from Citadel-Station-13/night_vision
Night vision trait but it just boosts barely-lit visibility
|
2019-12-21 15:30:32 +01:00 |
|
|
Ghom
|
a384b1782b
|
Merge pull request #10164 from kappa-sama/martialartist
What ho, Muscle Wizard! Might you cast us a spell?
|
2019-12-21 15:24:06 +01:00 |
|
|
Ghom
|
f30be0ace6
|
Merge pull request #10077 from ForrestWick/uplinkchanges
Moves brainwash surgery from role restricted to devices and tools in the uplink
|
2019-12-21 12:43:18 +01:00 |
|
|
Ghom
|
19fc981cc1
|
Merge pull request #9596 from Linzolle/abductor-update
Bring abductors up-to-date with /tg/.
|
2019-12-21 11:15:29 +01:00 |
|
|
Ghom
|
a7cda1aea0
|
Merge pull request #10059 from lolman360/HeadCorgi
you can pick up corgis now
|
2019-12-21 11:05:36 +01:00 |
|
|
lolman360
|
b490873f2a
|
ff
|
2019-12-21 13:13:37 +11:00 |
|
|
lolman360
|
4c7cc3615e
|
ff
|
2019-12-21 12:48:09 +11:00 |
|
|
lolman360
|
3043a4f8c9
|
ghom help
|
2019-12-21 12:47:36 +11:00 |
|
|
lolman360
|
7048e4e5ab
|
hhh
|
2019-12-21 12:43:48 +11:00 |
|
|
lolman360
|
b02ffa2e2d
|
Update inhand_holder.dm
|
2019-12-21 12:40:41 +11:00 |
|
|
r4d6
|
efdded7e48
|
Remove extra indentations
|
2019-12-20 18:38:47 -05:00 |
|
|
r4d6
|
bc70bc3882
|
Fix the nose boop.
|
2019-12-20 18:10:02 -05:00 |
|
|
Ghom
|
a398b7c413
|
Merge pull request #10200 from Citadel-Station-13/kevinz000-patch-125
Adds 8 character save slots
|
2019-12-20 22:55:22 +01:00 |
|
|
Ghom
|
b581f97fba
|
Merge pull request #9563 from Thalpy/Superbases-goodbye
[TESTMERGE] Goodbye, superpH, you were too wild for our world.
|
2019-12-20 14:28:21 +01:00 |
|
|
Ghom
|
d33feb6c35
|
Merge pull request #9888 from Citadel-Station-13/kevinz000-patch-116
The high voltage from tasers can now set people with fire stacks (so things like dousing in fuel) on fire
|
2019-12-20 14:26:50 +01:00 |
|
|
Ghom
|
f56684a473
|
Merge pull request #9925 from Linzolle/cosmic-brain
change cosmic coat crafting recipe
|
2019-12-20 14:26:24 +01:00 |
|
|
Ghom
|
6d824c99cf
|
Merge pull request #10051 from kappa-sama/patch-9
puts our legion more up to date with tg's
|
2019-12-20 14:25:09 +01:00 |
|
|
Ghom
|
d52a469933
|
Merge pull request #10142 from Trilbyspaceclone/patch-244
Feast or Famine is shit. Makes CE hardsuit raditation proof hat wise, buffes its rest of body by 5
|
2019-12-20 13:36:02 +01:00 |
|
|
Ghom
|
e526f26f46
|
Merge pull request #10126 from Putnam3145/he-tweaks
Makes HE pipes realistically radiate away heat
|
2019-12-20 13:34:47 +01:00 |
|
|
Ghom
|
1748a5ee4b
|
Merge pull request #10054 from kappa-sama/patch-10
autolathe .357 speedloaders->bullets, surplus rifle bullets in hacked lathe
|
2019-12-20 13:27:35 +01:00 |
|
|
Ghom
|
9567d53007
|
I'm a god. How can you defeat a god? What a grand and intoxicating innocence, how can you be so naive?
|
2019-12-20 13:24:48 +01:00 |
|
|
lolman360
|
6188ec034d
|
h
|
2019-12-20 16:10:13 +11:00 |
|
|
kevinz000
|
0feb54bf70
|
Update mob.dm
|
2019-12-19 17:54:01 -07:00 |
|
|
kevinz000
|
2f78c0a5db
|
Update mob.dm
|
2019-12-19 17:51:23 -07:00 |
|
|
Lin
|
8d54e8afcc
|
Merge pull request #10214 from Ghommie/Ghommie-cit472
Brings carbon action intent hotkeys down to living.
|
2019-12-19 23:42:06 +00:00 |
|