Commit Graph

8177 Commits

Author SHA1 Message Date
timothyteakettle
cff2e3d680 never set max amount to 0 2020-07-12 00:58:34 +01:00
timothyteakettle
8712dd6de4 bugfixes 2020-07-12 00:31:45 +01:00
Timothy Teakettle
c1592ad162 more rewards 2020-07-11 23:27:29 +01:00
silicons
31da81aff4 Merge pull request #12217 from Putnam3145/putnamos-for-real
The real fastmos: C++ monstermos port
2020-07-09 20:37:18 -07:00
Putnam
9b955e5d03 gotta replace all of them actually 2020-07-09 03:19:52 -07:00
Putnam
2a04ab19fd windoors :b:roke 2020-07-09 01:36:57 -07:00
Putnam
75c0b01c86 Updated to july 2020. 2020-07-08 23:13:26 -07:00
silicons
9828d6fe85 Merge pull request #12700 from KeRSedChaplain/POSTRATVAR
Post This Ratvar, OR how I regained my contributor role in one simple step, OR how I buffed clock cult unknowingly.
2020-07-08 22:51:36 -07:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
silicons
6d1ca993f6 Merge pull request #12648 from timothyteakettle/tray-and-jar
bluespace tray + bluespace jar
2020-07-08 03:10:44 -07:00
Timothy Teakettle
f0935a784d two missing traits woops 2020-07-07 23:24:25 +01:00
Timothy Teakettle
e07909ebe2 does it in a far superior way 2020-07-07 23:12:36 +01:00
Lin
33f56fd168 Merge pull request #12694 from Ghommie/Ghommie-cit833
mowing down experimental cloner copypasta.
2020-07-07 13:23:25 -05:00
timothyteakettle
ab5795b3d3 Update pet_carrier.dm 2020-07-07 03:03:09 +01:00
DeltaFire
eeadc9a0e7 fixes the kill once objective
the target being afk / disconnecting is now only accepted at roundend, and doesn't lead to it being regarded as permanently completed midround.
2020-07-06 23:00:36 +02:00
Ghommie
afb5b5237c linter & stuff. 2020-07-06 22:42:32 +02:00
Keate Senior
4ee72305d0 Post This Justiciar
sprites and object
2020-07-06 06:34:38 -04:00
Ghommie
562b57095d mowing down the experimental cloner copypasta. 2020-07-05 03:04:53 +02:00
Lin
703d03453b Merge pull request #12651 from Citadel-Station-13/silicons-patch-9
lowers shield blocking stamcost/second 3.5 to 2.5
2020-07-04 14:16:06 -05:00
Lin
d04b335d1a Merge pull request #12652 from silicons/cool
cybernetic implant shields will now automatically extend and be used to block if the user has no item to block with
2020-07-04 14:12:43 -05:00
Ghommie
3ba077be71 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit833 2020-07-04 21:04:33 +02:00
Ghommie
780f30bd4d Fixing cloning 2020-07-04 21:01:44 +02:00
Ghom
17ee8c5960 Merge pull request #12660 from YakumoChen/master
Reverts improv small arms, makes guncrafting easier and faster
2020-07-04 18:35:22 +02:00
silicons
bb065abab7 Merge pull request #12690 from BlackMajor/master
[s] Inheritance is something often overlooked.
2020-07-04 01:52:13 -07:00
BlackMajor
afdf8c698a fuck 2020-07-04 19:30:20 +12:00
silicons
c10350f10e Merge pull request #12677 from Ghommie/Ghommie-cit830
Fixes items' skills list keys missing associated traits and improves modulability a little.
2020-07-04 00:12:37 -07:00
silicons
a61e22de71 Merge pull request #12675 from Ghommie/Ghommie-cit828
Fixing (un)equip penalties from obscured inv slots.
2020-07-04 00:12:04 -07:00
silicons
103b8b7600 Merge pull request #12662 from kappa-sama/patch-29
makes bows and arrows more feasible improv weapons
2020-07-04 00:11:45 -07:00
silicons
f6be57269d Merge pull request #12687 from Ghommie/Ghommie-cit832
Fixing obscured inventory slots unequip block, for real.
2020-07-04 00:10:49 -07:00
BlackMajor
7c21f7bd4e [s] Don't give these to your kids for christmas
Someone did a fucky wucky.
2020-07-04 17:17:34 +12:00
timothyteakettle
d3448e04c9 fixes pet carrier edgecase 2020-07-04 03:00:35 +01:00
Ghommie
e3b1ca4942 Linter. 2020-07-03 19:57:38 +02:00
Ghommie
bde80eb1fb Fixing obscured inventory slots (un)equip block, for real. 2020-07-03 19:02:20 +02:00
silicons
824d11b085 death to lists 2020-07-03 02:34:59 -07:00
silicons
d85edbf8fb ok 2020-07-03 02:15:06 -07:00
timothyteakettle
05fb7a67fc Merge branch 'tray-and-jar' of https://github.com/timothyteakettle/Citadel-Station-13 into tray-and-jar 2020-07-03 03:46:12 +01:00
timothyteakettle
1316f51a03 better resist and air 2020-07-03 03:46:08 +01:00
Ghommie
f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02:00
Ghommie
396989f143 Fixes items' used skills list keys missing associated base traits. 2020-07-03 01:52:03 +02:00
Ghommie
6fc584518a Fixing (un)equip penalties from obscured inv slots. 2020-07-03 00:07:30 +02:00
silicons
9ae040b904 Merge pull request #12657 from bunny232/witchhunterhat
Witch hunter hat tweak.
2020-07-02 01:48:19 -07:00
silicons
3f1119fcdb Merge pull request #12630 from Ghommie/Ghommie-cit822
You can't (un)equip garments on/from obscured inventory slots anymore.
2020-07-02 01:44:59 -07:00
Timothy Teakettle
15e137dd18 Merge branch 'master' into tray-and-jar 2020-07-01 22:06:17 +01:00
Timothy Teakettle
8a0ab009dd give trays better capacity 2020-07-01 22:05:14 +01:00
Lin
fa1e92d588 Merge pull request #12656 from Ghommie/Ghommie-cit826
Fixing two handed items and etcetera.
2020-07-01 14:30:16 -05:00
Ghom
aaffe3ec12 Merge pull request #12647 from zeroisthebiggay/fuckfuckfuckfuck
attempts to port Wizard Gamemode now ends when all wizards and wizard apprentices are dead #47514
2020-07-01 19:46:16 +02:00
kappa-sama
406af65d93 you need 5 of these 2020-07-01 08:12:35 -04:00
kappa-sama
9cc6f5aa91 durathread->string 2020-07-01 08:09:43 -04:00
kappa-sama
0b0d9ff1a6 this 2020-07-01 07:56:55 -04:00
kappa-sama
cfc14a04f1 Merge branch 'master' into patch-28 2020-07-01 07:48:46 -04:00