Commit Graph

12930 Commits

Author SHA1 Message Date
necromanceranne 52b1f63941 Literally just kills spinfusors 2020-01-27 12:32:40 +11:00
necromanceranne 5e7b7143de Additional adjustments, added more damage to the mini ebow becaues I forgot to do that originally and made large ebows bulky and heavy weapons 2020-01-27 11:48:56 +11:00
Seris02 e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-27 08:33:38 +08:00
Seris02 0d1e458e9c yuh 2020-01-27 08:32:45 +08:00
Ghommie b6998a0b56 Fixes det revolver being riiiisky. 2020-01-27 00:44:25 +01:00
necromanceranne 8e489a7726 Hopefully I put in the override correctly 2020-01-27 10:41:27 +11:00
Ghom 27cd7745ed Merge pull request #10714 from Citadel-Station-13/kevinz000-patch-9
is_ctf_target now checks for innate faction var rather than clothing
2020-01-27 00:14:32 +01:00
kevinz000 f59a9d0009 aight bet 2020-01-26 14:05:15 -07:00
r4d6 2c8d12aa37 Make people actually able to speak dwarf 2020-01-26 15:50:13 -05:00
kevinz000 41f9669a83 Update other_reagents.dm 2020-01-26 13:29:55 -07:00
kevinz000 9292ff1972 Update damage_procs.dm 2020-01-26 13:27:54 -07:00
r4d6 31dd1bc69f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Dwarven_Language 2020-01-26 14:23:16 -05:00
r4d6 ac84ad803a Add dwarf language 2020-01-26 14:22:21 -05:00
Ghommie 41ee00b7df Refactoring APTFT altclick/verb options into flags 2020-01-26 18:53:16 +01:00
Ghom 17ea82afd6 Update vr_sleeper.dm 2020-01-26 17:25:24 +01:00
kevinz000 97c65aac89 Update kinetic_accelerator.dm 2020-01-26 03:06:31 -07:00
Hatterhat ff2785f24b boy i hope this fucking compiles 2020-01-26 02:47:41 -06:00
necromanceranne 5ce066a21e Altering the effects of the ebow to hopefully make it not terrible 2020-01-26 17:18:09 +11:00
kevinz000 0b119cbd52 ok 2020-01-25 23:11:36 -07:00
kevinz000 f842a249a4 Update meteor_wave.dm 2020-01-25 22:11:49 -07:00
kevinz000 d7ba4134e1 Update meteor_wave.dm 2020-01-25 22:10:39 -07:00
kevinz000 8b4a050ad3 ok 2020-01-25 22:03:53 -07:00
Ghom 9aca79a640 Merge pull request #10466 from Citadel-Station-13/kevinz000-patch-10
Makes monkey gorrilize on radiation easier to achieve
2020-01-26 05:50:15 +01:00
kevinz000 1b7a7737de reagent drain 2020-01-25 20:28:26 -07:00
kevinz000 f23799e3b4 uhh yeah 2020-01-25 20:25:18 -07:00
kevinz000 acfc7ca41a indestructible 2020-01-25 20:18:05 -07:00
kevinz000 02fe4b7630 this is a bad idea 2020-01-25 20:00:29 -07:00
kevinz000 259b992317 AAAAAAA 2020-01-25 19:56:50 -07:00
kevinz000 72e33d8832 bugfix 2020-01-25 19:46:32 -07:00
kevinz000 dc3e5e24fd Merge remote-tracking branch 'citadel/master' into the-p-o-o-l 2020-01-25 19:36:06 -07:00
kevinz000 603ab65ed1 Merge pull request #10151 from Ghommie/Ghommie-cit450
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
2020-01-25 19:33:26 -07:00
kevinz000 c5f2eeef3b FUCK 2020-01-25 19:31:57 -07:00
Putnam 6df56a2cf8 properly fixed flags, also made it close on one side's pressure 2020-01-25 18:31:53 -08:00
kevinz000 df4ca4b503 do after 2020-01-25 19:29:03 -07:00
Putnam aba40056b3 relief valve tweaks 2020-01-25 17:10:40 -08:00
kevinz000 3af72acfb2 compile 2020-01-25 17:26:43 -07:00
kevinz000 ebff6c9f38 compile, jump board crash to ground 2020-01-25 17:25:15 -07:00
kevinz000 19f1eba015 renames 2020-01-25 17:13:11 -07:00
kevinz000 483e1b2757 oh we needed that 2020-01-25 17:10:50 -07:00
kevinz000 443f1716e1 Merge remote-tracking branch 'citadel/master' into the-p-o-o-l 2020-01-25 17:04:37 -07:00
kevinz000 ec69b9de4d changes 2020-01-25 17:04:07 -07:00
Putnam3145 a08cd7c046 Merge pull request #10718 from r4d6/HE-Fix
Fix HE Manifold's sprites
2020-01-25 14:31:11 -08:00
r4d6 d5c09f11bc Fix 2020-01-25 17:23:00 -05:00
Artur 6619ac41c8 *PANIC* 2020-01-25 22:07:57 +02:00
kevinz000 c74a6eaf4c Update capture_the_flag.dm 2020-01-25 09:20:41 -07:00
kevinz000 40b479eb17 Update seeds.dm 2020-01-25 08:56:06 -07:00
kevinz000 c0b7541e62 Merge pull request #10691 from Seris02/mentorfix
very very tentative fix for the make mentor button
2020-01-25 08:08:32 -07:00
Ghom db8abcd7fb Merge pull request #10688 from Citadel-Station-13/kevinz000-patch-1
Fixes SOME of the problems with hilbert hotel
2020-01-25 15:32:21 +01:00
Ghom 4b6a601af7 Merge pull request #10646 from Poojawa/blindvorefixnumber244
Resolves Minor issues with vore code
2020-01-25 15:27:12 +01:00
Ghom 00667eeecd Merge pull request #10698 from Putnam3145/ghost-dojo-ban
Made ghost cafe mobs dust upon leaving, allowed ghost cafe bans
2020-01-25 15:25:26 +01:00