 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 |
|
|
Ghommie
|
081d3df750
|
This is one serious Pepe Silvia complex.
|
2019-12-14 22:52:40 +01: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 |
|
|
Ghommie
|
12b87b4f3d
|
Better.
|
2019-12-14 19:29:51 +01:00 |
|
|
Ghommie
|
2ccfaf38fb
|
consistency.
|
2019-12-14 19:27:39 +01:00 |
|
|
Ghommie
|
6117434c7f
|
Ok
|
2019-12-14 19:24:43 +01:00 |
|
|
Ghommie
|
70252d2914
|
Fixing a few pill bottle issues with the ChemMaster.
|
2019-12-14 19:20:02 +01:00 |
|
|
Ghommie
|
e5d45faee8
|
deadchat, not deathchat.
|
2019-12-14 18:53:53 +01:00 |
|
|
Artur
|
6124fbf316
|
Hopefully this fixes the linter errors
|
2019-12-14 19:04:36 +02:00 |
|
|
Ghommie
|
3891c91799
|
virtual reality component improvements, fixes and documentation.
|
2019-12-14 17:19:48 +01:00 |
|
|
Artur
|
d0493ac471
|
Reviewer and linter fixes, and veil tweak
|
2019-12-14 17:09:39 +02: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 |
|
|
BlackMajor
|
59d0376985
|
finished
|
2019-12-14 17:31:26 +13: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 |
|
|
Artur
|
9faf3d1dac
|
Mooaar fixeees
|
2019-12-14 01:01:38 +02:00 |
|
|
Ghommie
|
b39ae815f3
|
Porting several quirks code updates.
|
2019-12-13 16:12:04 +01:00 |
|
|
r4d6
|
5f95e0d5a6
|
Remove an extra antimatter engine shielding
|
2019-12-13 08:17:06 -05:00 |
|
|
BlackMajor
|
2bf35ec81c
|
Nuclear fist
|
2019-12-14 02:15:09 +13: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 |
|
|
Trilbyspaceclone
|
285833c8d3
|
Runtime fix
|
2019-12-12 21:51:50 -05:00 |
|
|
Trilbyspaceclone
|
658e050b1f
|
Ghommie correction
|
2019-12-12 21:47:54 -05:00 |
|
|
Trilbyspaceclone
|
e6282e95c2
|
Apply suggestions from code review
Ghommie fixes
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-12 21:46:31 -05: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
|
bc2e6a7f9b
|
Ports "Fixes powernet avail checks"
|
2019-12-12 17:35:35 +01:00 |
|
|
Ghommie
|
3545f10137
|
Fixing character setup preview icons.
|
2019-12-12 17:04:14 +01:00 |
|
|
Seris02
|
7b75612ad1
|
woops
|
2019-12-12 19:21:23 +08:00 |
|
|
Seris02
|
f565c1cd3c
|
adds some distance checks
|
2019-12-12 18:48:25 +08:00 |
|
|
Linzolle
|
acffa683c9
|
clearer message?
|
2019-12-12 00:40:08 -06: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 |
|
|
kappa-sama
|
b89d04884e
|
indents oops
|
2019-12-11 17:23:00 -05:00 |
|
|
kappa-sama
|
2b8f81bca3
|
idk maybe
|
2019-12-11 17:22:14 -05:00 |
|
|
kappa-sama
|
be3439e461
|
idk maybe?
|
2019-12-11 16:57:06 -05: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 |
|
|
Linzolle
|
6c8dc1d294
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into sabre-noise
|
2019-12-10 17:57:26 -06:00 |
|
|
Linzolle
|
bdd72fc797
|
make sound work?
|
2019-12-10 17:54:52 -06: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 |
|