kevinz000
|
87cf0b971a
|
Merge pull request #9221 from Sishen1542/chappy
adds some new nullrods with some back end null rod refactors
|
2019-09-06 16:47:46 -07:00 |
|
nik707
|
67f4276aab
|
Merge pull request #9104 from Sishen1542/tbaton
classic & telebaton no longer have attack delay
|
2019-09-02 18:35:56 -05:00 |
|
Sishen
|
3b40f73266
|
prayer beads no longer instantly deconvert, now inject holy water
|
2019-08-31 18:37:00 -04:00 |
|
Sishen
|
b4f27b8841
|
allows renaming of non null rod holyweapons, fixes hypertool description
|
2019-08-31 18:05:09 -04:00 |
|
Sishen
|
ba5021af5b
|
gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool
|
2019-08-31 02:55:29 -04:00 |
|
Sishen
|
b69c928419
|
FOR THE EMPEROR
|
2019-08-30 16:50:03 -04:00 |
|
Sishen
|
f6baaf8c58
|
honk honk
|
2019-08-14 17:06:58 -04:00 |
|
kevinz000
|
123b478edd
|
Merge pull request #8927 from Ghommie/Ghommie-cit151
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
|
2019-08-11 10:12:20 -07:00 |
|
Ghommie
|
12c4fc139d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
|
2019-08-09 04:00:23 +02: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
|
06271dfcff
|
aching special case.
|
2019-07-31 03:12:09 +02:00 |
|
Ghommie
|
991e4e8d41
|
Fixes and standarizes sword sheaths/scabbards overlays.
|
2019-07-31 02:43:40 +02:00 |
|
Ghommie
|
2b224400e3
|
Adds in worn overlays for different types of cuffs.
|
2019-07-29 04:31:27 +02:00 |
|
Ghommie
|
6c712a6931
|
Implementing nerfs.
|
2019-07-24 17:58:24 +02:00 |
|
Ghommie
|
b87442e633
|
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
|
2019-07-19 20:09:16 +02:00 |
|
Thalpy
|
9c7b1dee97
|
Merge branch 'master' into master
|
2019-07-15 21:23:04 +01:00 |
|
Ghommie
|
129ca9d71f
|
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-13 10:27:39 +02: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 |
|
Fermi
|
3ccf300052
|
Fixed empty hypovial
|
2019-06-25 23:11:43 +01:00 |
|
Fermi
|
3928e027b4
|
Fixes (see dev discussion)
|
2019-06-25 23:06:55 +01:00 |
|
Ghommie
|
67f00fc049
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42
|
2019-06-24 16:48:15 +02:00 |
|
Ghommie
|
38bc8a4efd
|
Ports "Removes SSreligion"
|
2019-06-23 01:45:21 +02:00 |
|
Ghommie
|
44a9fe9521
|
Fixes "Penlights Cannot Give Eye Exams"
|
2019-06-19 13:38:59 +02:00 |
|
Ghommie
|
480ee9a9da
|
Reskinnable PDAs.
|
2019-06-08 19:55:47 +02:00 |
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
deathride58
|
d40d9791c4
|
Merge pull request #8271 from Citadel-Station-13/kevinz000-patch-41
the chaplain can now choose a weakened Eutactic energy sword as a holy weapon
|
2019-05-21 08:06:21 -04:00 |
|
kevinz000
|
a9cbcdf74e
|
Merge pull request #8179 from Trilbyspaceclone/BShonker
[Ready]Makes a blue space bike horn HONK
|
2019-05-20 23:40:17 -07:00 |
|
deathride58
|
50bdbcc46f
|
Merge branch 'master' into kevinz000-patch-41
|
2019-05-17 00:29:31 -04:00 |
|
kevinz000
|
4190a00693
|
Update eutactic_blades.dm
|
2019-04-20 19:37:54 -07:00 |
|
kevinz000
|
b1d358ed79
|
Update eutactic_blades.dm
|
2019-04-20 19:26:53 -07:00 |
|
kevinz000
|
22f72c6431
|
Update eutactic_blades.dm
|
2019-04-20 19:23:10 -07:00 |
|
Poojawa
|
30dbc57e75
|
Labcoats carry mk II hypos, kits hold more
|
2019-04-11 06:55:57 -05:00 |
|
Trilbyspaceclone
|
dcfbcbae6d
|
woops forgot the moodlit
|
2019-03-28 19:49:50 -04:00 |
|
Trilbyspaceclone
|
2ecc532c48
|
Update honk.dm
|
2019-03-28 19:40:28 -04:00 |
|
Ragolution
|
890a23df52
|
Github client is shit.
Ooga
|
2019-03-14 00:16:11 -04:00 |
|
Ragolution
|
8cc589b069
|
Actually fixes the thing.
Turns out this was 100% easier to fix than I thought.
|
2019-03-14 00:03:37 -04:00 |
|
Poojawa
|
d429eb67cd
|
remodularize vtec code
Works as expected now but, combat rework meme jog/spring override speeds
|
2018-10-20 07:19:19 -05:00 |
|
Poojawa
|
1d6355534c
|
Unmodularizes vtech controls
I swear most of this shit just doesn't work in modularization anymore.
|
2018-10-20 04:18:09 -05:00 |
|
deathride58
|
212187620b
|
Merge pull request #7599 from Poojawa/override-override
Digitigrade Uniforms from Oracle
|
2018-09-29 21:30:12 -04:00 |
|
Poojawa
|
f2faf66586
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into modular_cit_cleaning
|
2018-09-28 22:09:19 -05:00 |
|
Poojawa
|
2daa197605
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into override-override
|
2018-09-27 05:09:23 -05:00 |
|
Poojawa
|
4ed3ac7b3d
|
Purges Icon_override
|
2018-09-26 14:27:28 -05:00 |
|
izzyinbox
|
9a98b92c58
|
fixes tennis ball equip slots (#7582)
|
2018-09-26 12:16:13 -07:00 |
|
Poojawa
|
4efdf4b0b3
|
Cleans up Modular_citadel
Yes I know it'll have merge conflicts later.
|
2018-09-21 03:52:13 -05:00 |
|
Poojawa
|
dc9fd6db12
|
readds V-tech control, modularized properly
|
2018-09-17 22:35:43 -05:00 |
|
deathride58
|
4208d6ea5f
|
Adds boombox donor item for Raiq/chefferz (#7368)
|
2018-08-03 19:29:19 -07:00 |
|
Letter N
|
5c79a794ec
|
Update holy_weapons.dm
|
2018-07-06 17:20:30 +08:00 |
|
Letter N
|
bff55cc362
|
Update handcuffs.dm
|
2018-07-06 17:19:56 +08:00 |
|