Ghommie
|
94f014589d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-25 17:09:34 +02:00 |
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
Ghommie
|
4c6f1b622b
|
Porting Goofconomy & co.
|
2020-04-17 07:48:11 +02:00 |
|
Ghommie
|
7615f63753
|
Oopsie
|
2020-04-11 17:43:09 +02:00 |
|
Ghommie
|
31e0321808
|
Minor action datum refactor and spellcasting fix.
|
2020-04-11 16:53:08 +02:00 |
|
Ghommie
|
b92da66f04
|
Fixing spellcasting and edge cases.
|
2020-04-06 17:32:51 +02:00 |
|
Ghom
|
33fc3ce1e0
|
Update spell.dm
|
2020-04-06 07:05:33 +02:00 |
|
kevinz000
|
413ded02c0
|
Merge pull request #11433 from Ghommie/Ghommie-cit616
Spellcasting element
|
2020-04-03 16:31:10 -07:00 |
|
Ghommie
|
8bb98f92ca
|
It's past midnight, time for your runtimes flattening.
|
2020-04-01 00:47:29 +02:00 |
|
Ghommie
|
76ff0d4931
|
M/F body preferences.
|
2020-03-22 19:47:48 +01:00 |
|
Ghommie
|
2045fb86f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616
|
2020-03-21 21:41:34 +01:00 |
|
Ghommie
|
3aa3ed189a
|
gunz
|
2020-03-18 23:53:10 +01:00 |
|
Ghommie
|
ea30b2fb1a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616
|
2020-03-15 22:35:59 +01:00 |
|
kevinz000
|
69c21f4b76
|
Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
|
2020-03-11 17:01:37 -07:00 |
|
Ghommie
|
d31075eb54
|
Spellcasting element
|
2020-03-11 16:23:30 +01:00 |
|
Seris02
|
cccd0e9eef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-03-09 16:49:32 +08:00 |
|
Ghommie
|
ee1eea8874
|
Ports "Switches out the three billion args of electrocute act for flags"
|
2020-03-09 04:01:23 +01:00 |
|
Seris02
|
f8adb4a80c
|
yeet 5
|
2020-02-28 14:30:29 +08:00 |
|
Seris02
|
c3ec44b0d0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-02-22 19:54:10 +08:00 |
|
Seris02
|
84d08fe122
|
firebreath change + update to tg genetics + calc patch
|
2020-02-22 19:42:33 +08:00 |
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
Ghom
|
6ea2843149
|
Merge pull request #11131 from Seris02/demondabbing
nerfs bloodcrawl to a cooldown of 0.6 seconds instead of no cooldown
|
2020-02-18 17:02:17 +01:00 |
|
Seris02
|
217661184d
|
nerf'd
|
2020-02-17 21:29:34 +08:00 |
|
Seris02
|
2d9c8ce8fc
|
fixing merge conflicts
|
2020-02-15 15:41:52 +08:00 |
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
Ghommie
|
c34714cb90
|
Something about the in operator and spaceDMM version update.
|
2020-02-10 07:37:59 +01:00 |
|
kevinz000
|
0337a6402b
|
Update wizard.dm
|
2020-02-07 03:16:52 -07:00 |
|
kevinz000
|
62b0e62952
|
Merge pull request #10623 from Putnam3145/antag-overhaul
Better antag objectives: for real this time
|
2020-02-06 16:25:22 -07:00 |
|
Seris02
|
ee7064840d
|
merge conflicts fixed finally
|
2020-02-05 18:42:16 +08:00 |
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
kevinz000
|
275b1f73e0
|
Merge pull request #10849 from Ghommie/Ghommie-cit547
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-04 03:39:14 -07:00 |
|
Putnam
|
53cad493a7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul
|
2020-02-03 03:17:23 -08:00 |
|
Ghommie
|
8de11845d5
|
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-02 03:39:49 +01:00 |
|
Ghommie
|
7f14fa3c71
|
not-so-wip now.
|
2020-01-31 19:20:59 +01:00 |
|
kevinz000
|
611fd7ea89
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-27 23:35:35 -07:00 |
|
kevinz000
|
831ac91917
|
Merge pull request #10073 from Ghommie/Ghommie-cit435
Ports timestop and sepia extracts improvements/tweaks.
|
2020-01-24 00:25:53 -07:00 |
|
loginsandylogout
|
a7a3a3a417
|
Update code/modules/spells/spell_types/lightning.dm
po
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-01-23 22:52:18 -06:00 |
|
Seris02
|
9761d68f4b
|
more merge conflict fixes
|
2020-01-24 10:14:31 +08:00 |
|
Commandersand
|
62c5fabcac
|
oops
|
2020-01-20 15:18:08 -06:00 |
|
Commandersand
|
a3f8233130
|
MEM
|
2020-01-20 15:15:28 -06:00 |
|
Commandersand
|
cd48f1a152
|
forcewall
|
2020-01-20 14:22:23 -06:00 |
|
Putnam
|
815b4f033d
|
made flavor things a game option + more hoard
|
2020-01-20 04:13:54 -08:00 |
|
Putnam
|
8e674817a9
|
errors
|
2020-01-20 00:30:18 -08:00 |
|
kevinz000
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07:00 |
|
Putnam
|
bc5646f8b1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul
|
2020-01-19 00:56:17 -08:00 |
|
Seris02
|
718ff58e0b
|
fixes + advanced injectors
|
2020-01-19 15:17:57 +08:00 |
|
Putnam
|
5eba760aa8
|
Reworked survivalist
|
2020-01-18 22:07:54 -08:00 |
|
Ghommie
|
9c0b78bc09
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 01:23:08 +01:00 |
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
kevinz000
|
9ef4cbfa76
|
refactor tags
|
2020-01-16 20:58:00 -07:00 |
|