cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-01-26 17:03:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,712 Commits 55 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

257 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Ghommie
f45f979c27 Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2020-01-12 23:21:03 +01:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
Ghommie
02fbbd4f95 Ouch. 2020-01-12 16:54:08 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghom
8bf75be8ff Yea no, go away zoomer kevinz 2020-01-05 15:38:23 +01:00
Ghommie
686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
kevinz000
0567dcd6df Update godhand.dm 2020-01-03 23:34:37 -08:00
kevinz000
a4fa24ac15 Update touch_attacks.dm 2020-01-03 23:33:39 -08:00
Ghommie
9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-20 23:40:21 +01:00
Ghommie
5bf252a58c Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls." 2019-12-17 01:57:56 +01:00
BlackMajor
4b177c4956 Adjusted NF balance 2019-12-16 01:20:14 +13:00
BlackMajor
59d0376985 finished 2019-12-14 17:31:26 +13:00
BlackMajor
2bf35ec81c Nuclear fist 2019-12-14 02:15:09 +13:00
Ghommie
542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Ghommie
72c093d14e Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2019-12-06 19:05:50 +01:00
Ghommie
91e628c73d Ports timestop and sepia extracts improvements/tweaks. 2019-12-06 19:01:42 +01:00
Ghommie
ec4e3898eb Fixing some wizard den teleportation issues. 2019-11-18 02:04:49 +01:00
Ghommie
6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-15 00:36:50 +01:00
Ghommie
09860d463f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-10 23:23:36 +01:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Ghommie
5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-10-29 13:38:16 +01:00
Ghommie
80cd4902ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273 2019-10-28 00:49:22 +01:00
kevinz000
bd9443252a Merge pull request #9579 from YakumoChen/shapeshift 
Ports #41638 and #43784, "Wizard Shapeshift now converts damage taken while transformed"
 2019-10-24 19:13:54 -07:00
kevinz000
9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54 
ports in the Hilbert's Hotel.
 2019-10-24 19:07:33 -07:00
Ghommie
ad7101d0aa ports anti-magic component code updates (holymelon not included). 2019-10-25 03:20:42 +02:00
Ghommie
2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Ghommie
93777f6703 Fixes artificier lesser magic missile. 2019-10-23 10:52:34 +02:00
YakumoChen
b78e6f27b6 ports #43784 2019-10-23 00:18:21 +00:00
YakumoChen
884b5421a0 ports #43784 2019-10-22 23:41:43 +00:00
Ghommie
735755019e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-09 01:18:30 +02:00
Ghommie
a1a3bbe99f Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones") 2019-10-06 19:16:13 +02:00