Commit Graph

226 Commits

Author SHA1 Message Date
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
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 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 ec4e3898eb Fixing some wizard den teleportation issues. 2019-11-18 02:04:49 +01:00
Ghommie 1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +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 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
Ghommie 5d1cac62da Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-08-24 13:50:22 +02:00
Ghommie f843a53fe9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-24 12:52:16 +02:00
Ghommie 23e3263fcb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-08 04:46:54 +02:00
Thalpy 5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
Ghommie ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Thalpy 9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
Ghommie dbb17a258a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-07-15 17:52:34 +02:00
Ghommie 16a7f6e5b2 Merge branch 'master' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit54 2019-07-15 17:46:13 +02:00
Ghommie 4df4cbd721 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-07-15 17:23:01 +02:00
Thalpy 4c4dbd0e17 Merge branch 'master' into master 2019-07-13 19:33:46 +01:00
Ghommie 129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie 490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Thalpy c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
Ghommie a3ab5f6d23 Moving the snowflake mob var to the component and finalizing. 2019-07-04 02:03:51 +02:00
Ghommie c58efa64c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-07-03 02:36:23 +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
Ghommie 28d3747c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-06-24 16:55:10 +02:00
Fermi 10109d0fe5 Merge branch 'pr/18' 2019-06-23 19:15:07 +01:00
kevinz000 fc5eb0c9d5 Merge pull request #8665 from Ghommie/Ghommie-cit59
Buffs out certain stun spells.
2019-06-23 06:19:41 -07:00
Ghommie d9d4a88a0b *Dramatic low-pitch scenic sound plays in* 2019-06-18 21:59:05 +02:00
Ghommie 4797a306cc applying suggestions. 2019-06-17 22:04:34 +02:00
Thalpy 41eee65b15 Merge branch 'master' into master 2019-06-17 12:18:40 +01:00
Ghommie 8b5bab29b2 Buffs out certain stun spells. 2019-06-17 08:06:14 +02:00
Ghommie a055f12394 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-06-16 12:41:06 +02:00
Ghommie ba3a2c00bb ports in the Hilbert's Hotel. 2019-06-16 10:50:59 +02:00
Fermi 6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
unknown 80eb813a07 RD can now suplex a rod. Good fucking luck. 2019-06-11 18:53:17 +03:00
Ghommie 3cbe9cf6b0 componentization part 1: "The flawed theorical code" 2019-06-10 22:37:38 +02:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Thalpy d9058fa53d Merge pull request #13 from Citadel-Station-13/master
OH BOY HERE WE GO AGAIN
2019-06-01 03:23:48 +01:00
Useroth a46312ede6 Update godhand.dm 2019-06-01 04:20:27 +02:00