Commit Graph

3676 Commits

Author SHA1 Message Date
Ghom 4fb549631f Don't use named arguments on new, please. 2019-12-28 19:12:10 +01:00
Seris02 897766e781 maybe fixes? 2019-12-29 00:55:13 +08:00
Seris02 70744ef171 ah 2019-12-29 00:19:19 +08:00
Seris02 2c26c3bdec does the fix? 2019-12-28 21:11:17 +08:00
Ghom a7ccd85bdb Merge pull request #10291 from Citadel-Station-13/kevinz000-patch-1
fixes pai holochassis spam
2019-12-28 13:15:42 +01:00
Seris02 973fdb61c6 probably fixes pandoras attacking their owners 2019-12-28 17:33:19 +08:00
Lin d562a5ba27 Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
2019-12-28 04:07:03 +00:00
kevinz000 139d4b4b3a ehh fine but why would you use this proc for that 2019-12-27 18:44:46 -08:00
Ghommie 21cfb2914b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-27 17:49:59 +01:00
Ghommie b4c0433d6d more work. 2019-12-27 17:45:19 +01:00
BlackMajor 4e1a9b83cf Pushing work for tonight. 2019-12-28 01:01:26 +13:00
BlackMajor e0e521977a Start just to make the PR 2019-12-27 22:37:57 +13:00
Lin 1931a2f715 Merge pull request #10242 from Ghommie/Ghommie-cit483
Ports "Refactors can_see_reagents"
2019-12-25 19:03:42 +00:00
kevinz000 8dd67afb9c Update pai_defense.dm 2019-12-24 23:43:16 -08:00
Ghommie 57cecd2499 work 2019-12-25 06:54:44 +01:00
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
Ghommie cd6bf76803 f 2019-12-25 01:41:35 +01:00
Ghommie 53d142b4c0 more work. 2019-12-25 01:34:33 +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
Ghommie ab34faa41d fix taur 2019-12-24 02:01:45 +01:00
Lin a0b90158c4 Merge pull request #10269 from Ghommie/Ghommie-cit488
Fix goose meat.
2019-12-24 00:56:07 +00:00
Ghommie d571bbd292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-24 00:07:32 +01:00
Ghommie e1949b0131 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-23 19:02:20 +01:00
Ghommie 14c73b7d01 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-23 14:21:08 +01: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
Ghommie 187b9bb13a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit483 2019-12-23 05:10:38 +01:00
Ghommie d88f50ac15 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-23 05:02:31 +01:00
Ghommie b75349bebf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-23 04:32:09 +01:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +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
Ghommie 395457f7ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471 2019-12-21 17:59:32 +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 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
Putnam ef360838da errors 2019-12-20 14:50:08 -08:00
Putnam c810145fc1 also adds aphrodisiacs, slaps, all hypno as prefs 2019-12-20 14:47:09 -08:00