Commit Graph

14466 Commits

Author SHA1 Message Date
Ghom dca1d8bcd3 Merge pull request #10761 from Putnam3145/fix-forced-gender
Makes gender change potion not work on people with pref
2020-01-29 05:31:18 +01:00
necromanceranne f9d6a9b9c4 Added the tweaks suggested by kevin but good fucking lord this changes a lot and also fuck the pka reload proc 2020-01-29 14:23:50 +11:00
Detective Google cc2ce746d8 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-01-28 20:19:55 -06:00
Ghom 44c141f009 Merge branch 'master' into hugbox_meteor_time 2020-01-29 02:28:12 +01:00
Ghom cf3466252e Merge pull request #10694 from Citadel-Station-13/kevinz000-patch-4
[s] more reasonable reagent logging
2020-01-29 01:59:09 +01:00
kevinz000 d3343a1e26 Merge pull request #10697 from Citadel-Station-13/Ghommie-patch-2
Makes transfer_ckey() less pedant.
2020-01-28 17:59:00 -07:00
Putnam3145 6d6c101044 Merge pull request #10713 from Citadel-Station-13/kevinz000-patch-7
[s] botany logging
2020-01-28 16:57:50 -08:00
kevinz000 3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527
Ported further runtime fixes by AnturK.
2020-01-28 17:57:26 -07:00
Putnam3145 a00d1fb05e Merge pull request #10729 from Citadel-Station-13/kevinz000-patch-5
The meteor wave report time to impact is now accurate (tip you were getting 2-3 minute warnings all along)
2020-01-28 16:56:50 -08:00
kevinz000 96df844aa3 Merge pull request #10754 from MalricB/Virgomangood
Reunites Shaggy (hair from virgo) with Scooby Terrowin
2020-01-28 17:56:11 -07:00
kevinz000 3d3086ac23 Merge pull request #10736 from Citadel-Station-13/Ghommie-patch-3
An oversight with one of the new area helper procs.
2020-01-28 17:55:39 -07:00
kevinz000 9dfcef68ed Merge branch 'master' into duke_moxley 2020-01-28 17:53:08 -07:00
kevinz000 f430fbcbd6 doubles stutter 2020-01-28 17:48:56 -07:00
kevinz000 9cf02ac96f moth sounds 2020-01-28 17:36:10 -07:00
Ghom fa5a69523b Merge pull request #10414 from CameronWoof/lights-booooooooooooooi
The Great Citadel De-Pissening of 2020
2020-01-28 18:12:30 +01:00
Ghom fbe79edc24 Merge pull request #10752 from Owai-Seek/cargocratetglass
6 More Crates
2020-01-28 18:08:58 +01:00
kevinz000 611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
kevinz000 4c2b0a826a WEW LAD 2020-01-27 23:26:24 -07:00
kevinz000 6cc995a137 atom color 2020-01-27 23:10:16 -07:00
kevinz000 59e41c20bf changes 2020-01-27 23:09:34 -07:00
kevinz000 70970b78f4 forcemove 2020-01-27 23:00:03 -07:00
Seris02 feca294f48 tada 2020-01-28 13:56:37 +08:00
kevinz000 d89b8d95cf BRAINLETMOMENT 2020-01-27 22:44:51 -07:00
kevinz000 6eac97524f compile 2020-01-27 22:42:48 -07:00
kevinz000 8c0d8b694c missing bracket 2020-01-27 22:39:16 -07:00
kevinz000 c76bf202a8 ladder climb 2020-01-27 22:34:31 -07:00
kevinz000 9867d7b377 -20% 2020-01-27 22:28:28 -07:00
kevinz000 3ce1fe2585 changes 2020-01-27 22:26:43 -07:00
kevinz000 1b164e1e1e Update pool_controller.dm 2020-01-27 22:25:16 -07:00
kevinz000 bc05819cee Update pool_drain.dm 2020-01-27 22:23:21 -07:00
kevinz000 171d50caff Update sharks.dm 2020-01-27 22:22:34 -07:00
kevinz000 0157371a15 Update pool_drain.dm 2020-01-27 22:21:12 -07:00
kevinz000 9d047f07f8 separate this a bit 2020-01-27 21:08:47 -07:00
kevinz000 57b977c2e5 why 2020-01-27 20:41:45 -07:00
kevinz000 7d53d6e162 s 2020-01-27 20:24:02 -07:00
Putnam cfd65d812a Makes gender change potion not work on people with pref 2020-01-27 19:13:50 -08:00
Ghom 2bf27e84e6 Merge pull request #10709 from Seris02/mammaltoxin
Adds mammal mutation toxin to green slime extract recipes
2020-01-28 04:06:01 +01:00
Putnam3145 209b681db1 Merge pull request #10706 from Ghommie/Ghommie-cit530
...? ...? (masked human mob examine pet peeve)
2020-01-27 19:02:13 -08:00
Ghom 362f0e57a4 Giving a hand. 2020-01-28 03:24:39 +01:00
Winter Flare 5883124e0d Removals.
Removed:
CBT Interrogation
Pastry Crate
Candlelit Dinner Crate
Pest Control Crate
2020-01-27 20:47:28 -05:00
Ghommie 5875f2578c demodularize and removes lot of unused clothing with missing sprites. 2020-01-28 02:32:46 +01:00
Winter Flare 24388f4fc1 Reverts Path changes. 2020-01-27 20:30:06 -05:00
Ghom f1197c8618 Merge pull request #10743 from necromanceranne/SHAZBOT
Spinfusors are no longer purchasable from cargo
2020-01-28 02:18:32 +01:00
kevinz000 7ae43a2249 fix 2020-01-27 17:51:59 -07:00
kevinz000 c665d971c0 Update misc.dm 2020-01-27 17:45:35 -07:00
kevinz000 91e8bec81a woops 2020-01-27 17:45:13 -07:00
kevinz000 5110a08817 Merge pull request #10737 from Ghommie/Ghommie-cit531
Refactoring APTFT altclick/verb options into flags
2020-01-27 17:44:20 -07:00
kevinz000 3055c2b4c1 Merge pull request #10742 from Ghommie/Ghommie-cit532
Fixes det revolver being risky to use.
2020-01-27 17:43:46 -07:00
kevinz000 0eb13d8f23 refactors guns a bit 2020-01-27 17:39:49 -07:00
Winter Flare 6e7d079928 Changed Dirty Mags and Candle 2020-01-27 19:34:33 -05:00