67f4276aab
Merge pull request #9104 from Sishen1542/tbaton
...
classic & telebaton no longer have attack delay
2019-09-02 18:35:56 -05:00
8e40e9d887
Merge pull request #9186 from Sishen1542/walklikeanegyptian
...
spellcheck of pharaoh gear, added pharaoh gear to chappy vendor p2
2019-08-28 00:02:39 -05:00
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
ed2c3f3cbd
Fixes spelling mistakes, adds pharaoh gear to chaplain vendor
2019-08-19 13:53:05 -04:00
f6baaf8c58
honk honk
2019-08-14 17:06:58 -04:00
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
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
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
b292bc7187
Merge pull request #9007 from Ghommie/Ghommie-cit168
...
Fixes and standarizes sword sheaths/scabbards overlays.
2019-08-05 00:49:49 -07:00
06271dfcff
aching special case.
2019-07-31 03:12:09 +02:00
991e4e8d41
Fixes and standarizes sword sheaths/scabbards overlays.
2019-07-31 02:43:40 +02:00
2b224400e3
Adds in worn overlays for different types of cuffs.
2019-07-29 04:31:27 +02:00
6c712a6931
Implementing nerfs.
2019-07-24 17:58:24 +02:00
b87442e633
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
2019-07-19 20:09:16 +02:00
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
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
2ec5d3f02e
Merge pull request #8886 from Ghommie/Ghommie-cit137
...
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-14 14:05:20 -07:00
a573689101
Merge pull request #8887 from Poojawa/last-word-hearing-psychics
...
Gang victory news report and last words for discord bot
2019-07-14 14:04:20 -07:00
f77bcc9765
Merge branch 'master' into master
2019-07-14 15:10:32 +01:00
4d895ae6c0
Gang victory news report and last words for discord bot
...
also slight improvement to gangster greetings
2019-07-13 08:38:19 -05:00
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
31bd9104bb
Ports "Adds blueshirt items to sectech and defines them better."
2019-07-13 06:42:09 +02:00
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
696d879874
Merge branch 'master' into master
2019-06-29 15:48:25 +01:00
a6caf4c63f
Merge pull request #8729 from Ghommie/Ghommie-cit79
...
Ports "Removes SSreligion"
2019-06-28 20:30:44 -07:00
3ccf300052
Fixed empty hypovial
2019-06-25 23:11:43 +01:00
3928e027b4
Fixes (see dev discussion)
2019-06-25 23:06:55 +01:00
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
38bc8a4efd
Ports "Removes SSreligion"
2019-06-23 01:45:21 +02:00
44a9fe9521
Fixes "Penlights Cannot Give Eye Exams"
2019-06-19 13:38:59 +02:00
d5279c8373
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-06-17 09:51:22 +02:00
480ee9a9da
Reskinnable PDAs.
2019-06-08 19:55:47 +02:00
b1439ecdb9
Update gang_items.dm
2019-06-08 11:09:18 -04:00
d3d2b8d898
should be ready.
2019-06-06 19:24:20 +02:00
af2598035a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-06-05 19:32:17 +02:00
0513f3464a
one
2019-06-05 19:20:25 +02:00
980c48180c
Merge pull request #8387 from JTGSZ/gangs
...
Ports gang mode
2019-06-05 01:55:19 -07:00
93813613aa
Some changes.
2019-05-27 14:42:07 -04:00
38ad6785a0
Over-reduced the item costs a bit too much.
...
Lets do it in tiny increments until It plays somewhat unpredictably for all sides.
2019-05-23 01:42:00 -04:00
080b29de79
Solves a few things.
2019-05-23 00:40:57 -04:00
4998b7cfa1
Actually, the cult team should process it instead.
...
Got you covered, badmins spawning cult on other modes.
2019-05-22 18:43:26 +02:00
6bb70297ec
Why did you check if the gamemode's type is an antagonist datum?
...
And why did it sort of work too?
I don't understand.
Pooj's copypasting this black magic, smh.
2019-05-22 06:09:18 +02:00
84016ed3ef
Here we go.
2019-05-21 12:30:44 -04:00
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
a9cbcdf74e
Merge pull request #8179 from Trilbyspaceclone/BShonker
...
[Ready]Makes a blue space bike horn HONK
2019-05-20 23:40:17 -07:00
03f129fa6e
More changes
2019-05-19 07:29:09 -04:00
09dfb448ed
woops
...
left that at 1 instead of 15
2019-05-18 05:51:53 -04:00
6c077758c6
ports gang
2019-05-18 05:06:22 -04:00
50bdbcc46f
Merge branch 'master' into kevinz000-patch-41
2019-05-17 00:29:31 -04:00
ba125a2648
Merge pull request #8270 from Citadel-Station-13/kevinz000-patch-40
...
makes Eutactic (so the other energy sword) swords not strictly crappier than normal swords, makes combining them possible and makes the hyper-eutactic blade not strictly crappier than the desword
2019-05-17 00:14:36 -04:00
nik707