TrilbySpaceClone
084b37ae4e
tada
2019-09-04 10:13:32 -04:00
nik707
bff828d3be
Merge pull request #9202 from Trilbyspaceclone/patch-216
...
Ports "Fixes wallets #510 " From KeplerStation
2019-08-29 19:33:08 -05:00
BlackMajor
4d6b9f5da1
Merge pull request #8537 from Ghommie/Ghommie-cit28
...
Fixes emags wasting charges on un-emaggable stuff.
2019-08-28 13:54:03 +12:00
Trilbyspaceclone
77863119f2
Update wallets.dm
2019-08-27 11:31:52 -04:00
kappa-sama
036115eddb
wallets can hold keys
2019-08-25 15:45:47 -04:00
Ghommie
24fe7126c4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-08-24 19:05:51 +02:00
kevinz000
ba2a6d6626
Merge pull request #9145 from Trilbyspaceclone/patch-212
...
gives drones a RPD
2019-08-21 08:15:08 -07:00
Sishen
7a8e2c3f50
rebalances the lawyer heirloom briefcase while giving it a fancy new sprite
2019-08-19 17:54:16 -04:00
Trilbyspaceclone
d1404a84d8
Update backpack.dm
2019-08-19 07:03:54 -04:00
kevinz000
3f734d9aca
Merge pull request #8763 from Trilbyspaceclone/patch-188
...
Reblances bone satchles
2019-08-18 23:39:39 -07:00
kevinz000
3ef29bbbeb
Merge pull request #9097 from lolman360/durathread
...
Adds durathread.
2019-08-18 23:37:07 -07:00
TrilbySpaceClone
2b08b97f1d
yay
2019-08-17 23:54:50 -04:00
Trilbyspaceclone
906e7a1bd8
Update backpack.dm
2019-08-17 00:25:40 -04:00
lolman360
ae2ccb2686
should be done now
2019-08-17 12:20:37 +10:00
lolman360
e838da8039
Merge pull request #3 from Citadel-Station-13/master
...
3
2019-08-17 11:55:56 +10:00
Winter Flare
04c302b08e
Service Tweaks
...
Makes the Janibelt a bit more useful by expanding its limited pool of allowed items. Beakers and Bottles for carrying additional space cleaner/ammonia/water.
Allows the plant DNA maniuplator to be wrenched and moved.
2019-08-15 06:28:46 -04:00
lolman360
b283a0979c
yay
2019-08-11 14:56:42 +10:00
lolman360
e2e7133eba
ew things are called different things
2019-08-11 14:54:17 +10:00
lolman360
f131104a73
Add files via upload
2019-08-11 10:51:38 +10:00
Thalpy
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
kevinz000
b292bc7187
Merge pull request #9007 from Ghommie/Ghommie-cit168
...
Fixes and standarizes sword sheaths/scabbards overlays.
2019-08-05 00:49:49 -07:00
Ghommie
6dd92ce122
.
2019-07-31 21:26:59 +02:00
Ghommie
1639a7002a
Adds in a stereotypical vegetarian MRE. Tweaks the rest.
2019-07-31 21:02:12 +02:00
Ghommie
16afae1e14
boolean
2019-07-31 03:06:20 +02:00
Ghommie
991e4e8d41
Fixes and standarizes sword sheaths/scabbards overlays.
2019-07-31 02:43:40 +02:00
Fermi
fbbc4d8589
Merge branch 'pr/21'
2019-07-29 22:57:40 +01:00
kevinz000
2c3e46bbb9
Merge pull request #8982 from Ghommie/Ghommie-cit160
...
[s] ports "Fixes ore satchel exploits, various storage size circumventions."
2019-07-29 04:37:36 -07:00
kevinz000
156d525897
Merge pull request #8984 from Ghommie/Ghommie-cit162
...
allows the captain sabre sheat to hold stunswords.
2019-07-29 04:37:21 -07:00
Fermi
d080446a77
Merge branch 'pr/20'
2019-07-28 23:28:19 +01:00
Ghommie
a9e1fadcd4
allows the captain sabre sheat to hold stunswords.
2019-07-27 22:47:36 +02:00
Ghommie
0a560b171c
[s] ports "Fixes ore satchel exploits, various storage size circumventions."
2019-07-27 13:01:27 +02:00
Fermi
309bc1c899
Requested change.
2019-07-20 20:34:44 +01:00
Fermi
e5648fd471
Made bat part of previous bat type.
2019-07-19 22:57:22 +01:00
Fermi
75d6768ba7
Changed how the box works so it's not a storage.
2019-07-19 22:12:05 +01:00
Fermi
4ab5060596
Adds secbats (tested)
2019-07-19 17:07:02 +01:00
Thalpy
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
Ghommie
1e1f8e627f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-15 17:33:41 +02:00
kevinz000
2c41141d2f
Merge pull request #8676 from Trilbyspaceclone/patch-176
...
Adds a Rapier for 8 Trilby cats
2019-07-14 14:46:44 -07:00
kevinz000
da8b43f054
Merge pull request #8785 from Trilbyspaceclone/Just_Smile!
...
Makes Clowns and HonkMother Chaplins smile!
2019-07-14 14:11:09 -07:00
Thalpy
4c4dbd0e17
Merge branch 'master' into master
2019-07-13 19:33:46 +01:00
Thalpy
c418312cc6
Merge branch 'master' into master
2019-07-09 05:33:09 +01:00
Ghommie
5b97a7533d
it only affects maploaded items anyway.
2019-07-09 04:34:13 +02:00
Ghommie
bd9fa27ca1
Now it's tested.
2019-07-08 16:24:26 +02:00
Ghommie
9d35584e58
fixes uninteractable toolboxes.
2019-07-08 15:34:19 +02:00
Ghommie
9043402483
Rubber toolboxes.
2019-07-08 14:34:14 +02:00
kevinz000
1b4df74efb
Merge pull request #8802 from Ghommie/Ghommie-cit101
...
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
2019-07-07 02:39:07 -07:00
Thalpy
8a6e669060
Merge branch 'master' into master
2019-07-04 03:14:29 +01:00
kevinz000
06f1eb6dcd
Merge pull request #8810 from Trilbyspaceclone/patch-185
...
Corrects Plastitanium total object damage
2019-07-03 05:18:21 -07:00
Ghommie
ffecca8c11
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-03 03:24:28 +02:00
Trilbyspaceclone
88c01dd521
I need to take a brake
2019-07-01 16:47:50 -04:00
