 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 |
|
|
Artur
|
6c4e733a38
|
More testmerge fixes
|
2020-07-03 15:16:02 +03: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 |
|
|
Artur
|
6ee1eba56c
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-02 23:23:47 +03: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 |
|
|
silicons
|
e2975a44a1
|
Merge branch 'master' into policy
|
2020-07-02 01:23:19 -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 |
|
|
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 |
|
|
kappa-sama
|
1f38c3029c
|
yeah ok
|
2020-07-01 07:40:43 -04:00 |
|
|
kappa-sama
|
5c7c300bf0
|
these do nothing
|
2020-07-01 04:58:44 -04:00 |
|
|
YakumoChen
|
ed017cc22a
|
Update sheet_types.dm
|
2020-07-01 08:53:08 +00:00 |
|
|
YakumoChen
|
4c460278b4
|
removes improv handgun spawns
|
2020-07-01 08:52:09 +00:00 |
|
|
bunny232
|
afe9b2dfbd
|
Update holy_weapons.dm
|
2020-06-30 11:15:40 -04:00 |
|
|
Ghommie
|
cd1c5511a4
|
Fixing two handed items and etcetera.
|
2020-06-30 16:24:04 +02:00 |
|
|
silicons
|
2039496739
|
groan
|
2020-06-30 03:05:15 -07:00 |
|
|
silicons
|
84f6efe683
|
Update shields.dm
|
2020-06-29 23:22:48 -07:00 |
|
|
timothyteakettle
|
1748088d42
|
small sprite improvement
|
2020-06-30 00:56:54 +01:00 |
|
|
timothyteakettle
|
b36ce5ee5f
|
starts locked so it doesnt look ass
|
2020-06-30 00:47:38 +01:00 |
|
|
timothyteakettle
|
bbd9d3c61f
|
better air
|
2020-06-30 00:38:33 +01:00 |
|
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|
|
Timothy Teakettle
|
0e57e0dd7a
|
atmos
|
2020-06-30 00:09:14 +01:00 |
|
|
Ghommie
|
9dc4b99620
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-30 00:49:06 +02:00 |
|
|
Timothy Teakettle
|
3eb5901a57
|
air is good
|
2020-06-29 22:56:25 +01:00 |
|
|
Cirno
|
03d79a1b65
|
I think this changed pills?
|
2020-06-29 18:52:21 -03:00 |
|
|
silicons
|
26fee48cec
|
Merge pull request #12645 from Ghommie/Ghommie-cit825
More and more fixes.
|
2020-06-29 14:18:10 -07:00 |
|
|
Putnam3145
|
ee2fedd4af
|
Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
|
2020-06-29 12:44:33 -07:00 |
|
|
Ghom
|
b280c0f550
|
Merge pull request #12622 from timothyteakettle/grammar-fixes
big batch of spelling/grammar corrections
|
2020-06-29 21:13:06 +02:00 |
|
|
Ghommie
|
0779dd560e
|
More and more fixes.
|
2020-06-29 18:52:37 +02:00 |
|
|
Timothy Teakettle
|
70a2238f04
|
more pet carrier changes
|
2020-06-29 17:43:16 +01:00 |
|
|
timothyteakettle
|
2e4c5e322d
|
tray and jar
|
2020-06-29 02:49:31 +01:00 |
|
|
Ghommie
|
a34a7ba5d4
|
You can't (un)equip garments on/from obscured inventory slots anymore.
|
2020-06-28 01:10:22 +02:00 |
|
|
silicons
|
2ab69c0170
|
Merge pull request #12603 from b1tt3r1n0/Pouches(again)
Some edits to pouches, and something that can hold sheets.
|
2020-06-27 14:54:57 -07:00 |
|
|
silicons
|
45a6061958
|
Merge pull request #12596 from Ghommie/Ghommie-cit819
Porting further material datum features and improvements.
|
2020-06-27 14:53:28 -07:00 |
|
|
silicons
|
8b04fd70de
|
Merge pull request #12615 from Ghommie/Ghommie-cit821
Solving several issues.
|
2020-06-27 14:52:59 -07:00 |
|
|
Ghom
|
58778f2e6e
|
Merge pull request #12619 from timothyteakettle/what-if-blood-didnt-suck
slimes blood colour is their body colour
|
2020-06-27 22:14:17 +02:00 |
|
|
silicons
|
1d4a54d880
|
log
|
2020-06-26 23:47:16 -07:00 |
|
|
silicons
|
0df5aa083b
|
policies and code hooks
|
2020-06-26 23:41:44 -07:00 |
|