Commit Graph

17075 Commits

Author SHA1 Message Date
kevinz000
2c228571f3 nerfs 2019-12-16 15:39:22 -07:00
kevinz000
1701811fb6 kay 2019-12-16 11:35:04 -07:00
kevinz000
aa14713fdd nerfs 2019-12-16 08:12:49 -07:00
kevinz000
b3ad352a96 stuff 2019-12-16 08:10:41 -07:00
kevinz000
a784235e35 scanline 2019-12-16 02:05:52 -07:00
kevinz000
f11ab5eb61 hm 2019-12-15 23:29:25 -07:00
kevinz000
80ffb13f06 bypass joblock 2019-12-15 23:24:43 -07:00
kevinz000
78e9b82eb6 trying too hard 2019-12-15 23:03:44 -07:00
kevinz000
57748fcdc8 changes 2019-12-15 22:28:41 -07:00
kevinz000
932bdfd325 kay 2019-12-15 21:57:22 -07:00
kevinz000
3b47949f82 haha fuck that's a lotta changes 2019-12-15 19:59:15 -07:00
kevinz000
5f27103641 god FUCK you icons 2019-12-15 17:30:30 -07:00
kevinz000
8c27c176ca move this.. 2019-12-15 09:12:58 -07:00
kevinz000
db767d8ddf bad idea 2019-12-15 00:37:34 -07:00
kevinz000
a4ffef5b1f Typos 2019-12-15 00:36:20 -07:00
kevinz000
600017f4e1 experimental filter 2019-12-15 00:34:12 -07:00
kevinz000
297c909b76 resting stuff 2019-12-15 00:29:18 -07:00
kevinz000
586dcb6f81 welp i got lazy 2019-12-15 00:15:32 -07:00
kevinz000
4970675467 s 2019-12-15 00:06:11 -07:00
Putnam3145
2e9503f6d7 Merge pull request #10166 from Ghommie/Ghommie-cit457
Ports "Roundstart borg brains no longer decay."
2019-12-14 20:37:57 -08:00
Lin
cce63507d1 Merge pull request #9970 from Ghommie/Ghommie-cit402
they're pretty bad, I'm not sure how these actually got in actually. thanks kevin
2019-12-15 00:16:34 +00:00
Lin
49c37641a7 Merge pull request #10122 from Citadel-Station-13/kevinz000-patch-124
nerfs factorio (conveyors can no longer stack more than 150 items on one tile)
2019-12-15 00:04:58 +00:00
Lin
1f852ea92a Merge pull request #10150 from Trilbyspaceclone/patch-245
Corrects telegram hat icon, adds a new dog fashion to telegram hat
2019-12-15 00:02:57 +00:00
Lin
43646434a0 Merge pull request #10163 from Ghommie/Ghommie-cit455
Allows blood bank generators to be wrenched and unwrenched.
2019-12-14 23:59:58 +00:00
Putnam3145
bd1040ab60 Merge pull request #10171 from r4d6/patch-1
Who the fuck put 10 shielding when you need 9?
2019-12-14 11:04:37 -08:00
Lin
2e003b7383 Merge pull request #10050 from Ghommie/Ghommie-cit427
Adds view and viewers checks for ranged construction devices such as ARCD and RLD.
2019-12-14 05:33:31 +00:00
kevinz000
659b78d8b8 Merge pull request #10162 from BlackMajor/Yeehaw
Removes medihounds (actually just makes them a medical aux sprite)
2019-12-13 16:52:22 -07:00
r4d6
5f95e0d5a6 Remove an extra antimatter engine shielding 2019-12-13 08:17:06 -05:00
Ghommie
2611023488 Ports "Roundstart borg brains no longer decay." 2019-12-13 07:33:45 +01:00
nik707
cdeb4733aa Merge pull request #9863 from BlackMajor/Yote
No adrenals for borgs please
2019-12-12 23:50:34 -06:00
Ghommie
319d4d51bb Allows blood bank generators to be wrenched and unwrenched. 2019-12-13 04:26:37 +01:00
Ghommie
79328012b0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit402 2019-12-13 03:41:22 +01:00
BlackMajor
83a707ee93 Removes medihounds, same treatment as janihounds 2019-12-13 13:48:22 +13:00
BlackMajor
725414bd03 Merge pull request #9894 from Putnam3145/real-explosion-fix
[TESTMERGE] Explosion/bomb armor rework
2019-12-13 10:20:33 +13:00
Putnam3145
71b2754aa6 Merge pull request #10121 from kappa-sama/patch-12
plasmafist wizard plasmafist wizard
2019-12-12 12:28:49 -08:00
Putnam3145
9234876ad1 Merge pull request #10156 from Ghommie/Ghommie-cit451
Fixing character setup preview icons.
2019-12-12 09:30:34 -08:00
Ghommie
3545f10137 Fixing character setup preview icons. 2019-12-12 17:04:14 +01:00
Lin
a4d52454db Merge pull request #10085 from Ghommie/Ghommie-cit440
Fixes reviver implant having been a crapshot ever since soft-crit was introduced years ago.
2019-12-12 02:13:54 +00:00
kevinz000
ded283fa55 Update conveyor2.dm 2019-12-11 14:41:58 -07:00
kevinz000
dfec60c557 Merge pull request #10140 from Putnam3145/dynamic-not-in-secret
Makes secret's dynamic roundstart report not tell people to contact a coder
2019-12-11 14:38:49 -07:00
kevinz000
77327ba899 Merge pull request #10143 from Putnam3145/dynamic-midround-doubledip
Dynamic no longer double dips on refunds for ghost antags with not enough applicants
2019-12-11 14:38:17 -07:00
Trilbyspaceclone
a7c8fb6470 corrects/adds a new dog fashion to telegram hat 2019-12-11 12:43:07 -05:00
Lin
9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-12-10 23:52:31 +00:00
Putnam
7b10c57b5c Actually gotta rework this properly 2019-12-10 14:01:33 -08:00
Putnam
1de118d40e Dynamic no longer double dips on refunds for ghost antags 2019-12-10 13:55:58 -08:00
Putnam
7880340142 Make dynamic message in secret not bug me 2019-12-10 07:58:13 -08:00
BlackMajor
8817f04e19 Merge pull request #9747 from Ghommie/Ghommie-cit329
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
2019-12-10 11:18:55 +13:00
BlackMajor
8ce9dcc471 Merge pull request #10082 from Citadel-Station-13/kevinz000-patch-122
Bluespace launchpad QoL (read: powercreep)
2019-12-10 11:16:59 +13:00
BlackMajor
716df40d7a Merge pull request #10083 from Ghommie/Ghommie-cit439
Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter.
2019-12-10 11:15:56 +13:00
Putnam3145
0a8dcc3712 Merge pull request #10113 from Ghommie/Ghommie-cit448
Fixes a long lasting runtime with filter data sorting.
2019-12-09 13:49:41 -08:00