 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
|
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 |
|
|
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 |
|
|
kevinz000
|
86074ae6b1
|
lowered to 10 after i struggled to open tickets panel
|
2019-12-21 14:33:02 -08: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
|
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
|
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 |
|
|
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
|
42d8228c75
|
Merge pull request #9722 from Ghommie/Ghommie-cit320
Umodularize saycode and meat slabs.
|
2019-12-19 23:03:48 +00:00 |
|
|
kevinz000
|
23f7815c52
|
Merge pull request #10204 from r4d6/patch-2
Port boops and handshakes
|
2019-12-19 04:01:52 -07:00 |
|
|
kevinz000
|
dcca9eb0d6
|
Merge pull request #10223 from BlackMajor/Yeehaw
Removes Security K9 dogborg. The last of the infinity dogborg removals. (same treatment as the others)
|
2019-12-19 03:24:36 -07:00 |
|
|
lolman360
|
e8dc9480b0
|
AAAAAAAAAAAAAAAAAAAA
|
2019-12-19 18:30:38 +11:00 |
|
|
lolman360
|
d8f0e983f1
|
lolman acctually knows how the stuff work
|
2019-12-19 18:24:24 +11:00 |
|
|
lolman360
|
8fc095d63e
|
Update carbon.dm
|
2019-12-19 17:29:35 +11:00 |
|
|
Ghommie
|
f945577655
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit320
|
2019-12-18 19:20:38 +01:00 |
|
|
Trilbyspaceclone
|
0f5c8db456
|
Merge branch 'master' into donut
|
2019-12-17 15:12:51 -05:00 |
|
|
Putnam3145
|
6b8f9427d0
|
Merge pull request #10153 from Linzolle/fireman-clarity
make unable to carry fireman message more clear when unable to carry non-humans
|
2019-12-17 12:09:08 -08:00 |
|
|
Putnam3145
|
b8c5290011
|
Merge pull request #10026 from Linzolle/neck-slice
Neck slice
|
2019-12-17 11:58:00 -08:00 |
|
|
Putnam3145
|
ed44b3130c
|
Merge pull request #10172 from Ghommie/Ghommie-cit460
Porting several quirks code updates.
|
2019-12-17 11:51:03 -08:00 |
|
|
Putnam3145
|
7017ab243b
|
Merge pull request #10216 from Ghommie/Ghommie-cit474
Porting a few martial art code updates.
|
2019-12-17 11:47:19 -08:00 |
|
|
Putnam3145
|
7a6541936c
|
Merge pull request #10111 from kappa-sama/patch-11
send help please, or how i vowed to kill kevinz (you can now strip people while aggrograbbing)
|
2019-12-17 11:38:35 -08:00 |
|
|
Putnam3145
|
670141edf7
|
Merge pull request #10209 from Ghommie/Ghommie-cit470
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
|
2019-12-17 11:26:36 -08:00 |
|
|
Ghommie
|
f2cf146255
|
Two slimepeople fixes.
|
2019-12-17 12:49:04 +01:00 |
|
|
BlackMajor
|
5245898c25
|
whoops
|
2019-12-17 23:46:15 +13:00 |
|
|
BlackMajor
|
03d2e9eb6d
|
Compress secK9
|
2019-12-17 23:32:51 +13:00 |
|
|
Ghommie
|
6b7dcbceb0
|
Porting a few martial art code updates.
|
2019-12-17 03:19:07 +01:00 |
|
|
Lin
|
237fbaa02d
|
Merge pull request #10180 from Ghommie/Ghommie-cit462
[s] virtual reality component improvements, fixes and documentation.
|
2019-12-17 01:05:10 +00:00 |
|
|
Putnam3145
|
6365a430cc
|
Merge pull request #10208 from Ghommie/Ghommie-cit469
Fixes AI being unable to talk through the holopad.
|
2019-12-16 10:57:26 -08:00 |
|
|
Ghommie
|
93fbc17428
|
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
|
2019-12-16 17:58:50 +01:00 |
|
|
Ghommie
|
9c5a66af67
|
Fixes AI being unable to talk through the holopad.
|
2019-12-16 15:58:10 +01:00 |
|
|
r4d6
|
51a17dff94
|
Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-12-16 09:23:42 -05:00 |
|
|
r4d6
|
c291511ab6
|
Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-12-16 09:23:35 -05:00 |
|