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 |
|
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 |
|
Trilbyspaceclone
|
88c01dd521
|
I need to take a brake
|
2019-07-01 16:47:50 -04:00 |
|
Ghommie
|
8c1e6ff66a
|
Thanks for pointing that out, lolman.
|
2019-07-01 09:24:35 +02:00 |
|
Ghommie
|
f39a5d2f6a
|
Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix.
|
2019-06-30 21:53:33 +02:00 |
|
TrilbySpaceClone
|
688fabfffc
|
Honk
|
2019-06-29 21:03:38 -04:00 |
|
Thalpy
|
696d879874
|
Merge branch 'master' into master
|
2019-06-29 15:48:25 +01:00 |
|
kevinz000
|
a6caf4c63f
|
Merge pull request #8729 from Ghommie/Ghommie-cit79
Ports "Removes SSreligion"
|
2019-06-28 20:30:44 -07:00 |
|
kevinz000
|
6c77443887
|
Merge pull request #8720 from Ghommie/Ghommie-cit76
Sort of porting MRE rations from Yogstation.
|
2019-06-28 05:28:35 -07:00 |
|
Sishen
|
555c1adf67
|
fix per kevs request
|
2019-06-28 08:20:59 -04:00 |
|
kevinz000
|
f76737dc04
|
Merge pull request #8708 from Trilbyspaceclone/patch-185
Corrects the "Durasteel" to be plastitanium tool boxes
|
2019-06-28 05:18:35 -07:00 |
|
kevinz000
|
ee852382f8
|
Merge pull request #8726 from Sishen1542/biblethump
Tweaks to chaplain bible heals. Time to pull out the old brainbuster.
|
2019-06-28 05:14:57 -07:00 |
|
Trilbyspaceclone
|
6ad0a0ba0d
|
Update belt.dm
|
2019-06-26 20:14:05 -04:00 |
|
Trilbyspaceclone
|
6b173432b2
|
Update belt.dm
|
2019-06-26 20:09:37 -04:00 |
|
Trilbyspaceclone
|
ede0bbe89e
|
Merge branch 'master' into patch-185
|
2019-06-23 20:56:25 -04:00 |
|
Fermi
|
10109d0fe5
|
Merge branch 'pr/18'
|
2019-06-23 19:15:07 +01:00 |
|
TrilbySpaceClone
|
05416b8f53
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into patch-176
|
2019-06-23 13:00:17 -04:00 |
|
kevinz000
|
e7331b3c98
|
Merge pull request #8571 from Thalpy/Dwarf
Medical smartdarts.
|
2019-06-23 06:24:10 -07:00 |
|
Ghom
|
41bd3caf3c
|
Ports "Reorganizes the uplink, adds grenades and explosives category." (#8669)
* Ports "Reorganizes the uplink, adds grenades and explosives category."
* Unbent codex, singing the sorrow of aborted spoils.
* .
|
2019-06-23 06:00:27 -07:00 |
|
Ghommie
|
38bc8a4efd
|
Ports "Removes SSreligion"
|
2019-06-23 01:45:21 +02:00 |
|
Sishen
|
934c1c0624
|
smite the heretics
|
2019-06-22 17:27:33 -04:00 |
|
Ghommie
|
f97a4b3a78
|
changes.
|
2019-06-22 19:50:56 +02:00 |
|
Ghommie
|
d71b50a4f1
|
Forgot we are dealing with a prototype object.
|
2019-06-22 17:23:32 +02:00 |
|
Ghommie
|
b85d4d6fb3
|
Sort of porting MRE rations from Yogstation.
|
2019-06-22 16:05:03 +02:00 |
|