Commit Graph

17813 Commits

Author SHA1 Message Date
Putnam ee20e23777 made beaker spawn on pandemic if hands are full 2019-10-14 19:48:20 -07:00
lolman360 140306a97f Update tools.dm 2019-10-15 13:25:41 +11:00
deathride58 7cfd8fa763 zzz 2019-10-14 20:05:15 -04:00
Ghommie 0cb433ba99 Ports some in operator misuse bugfixes. 2019-10-15 00:26:13 +02:00
deathride58 b3a81dce01 Secborg buffs - Adds incapacitation functionality to k9 jaws, gives secborg a hybrid taser, tweaks pounces, adds config option to weaken secborgs 2019-10-14 18:18:32 -04:00
Ghommie 80b91a56a8 undefined var fix 2019-10-14 23:58:39 +02:00
JTGSZ 3a45027ed8 Moved var out of organ into its proc. 2019-10-14 17:56:18 -04:00
JTGSZ 9ccff735b8 update comments 2019-10-14 17:42:34 -04:00
JTGSZ 1af18741d9 Commit, suggestions. 2019-10-14 17:37:02 -04:00
Ghommie d67e339980 teleprods works on non-carbons too now and minor stunbaton tweak. 2019-10-14 22:10:03 +02:00
deathride58 6245d5df30 Merge pull request #9471 from Citadel-Station-13/exploits
[s] fixes some exploits
2019-10-14 14:16:46 -04:00
JTGSZ 45367fbe24 unneeded comment as they aren't special now 2019-10-14 10:35:41 -04:00
JTGSZ 9cac961ba3 Halloween lava dwarves 2019-10-14 10:27:09 -04:00
Fermi a80b5c8a84 Autosurgies 2019-10-14 13:39:39 +01:00
Fermi 8ddd5402fe Mobcheck 2019-10-14 13:35:42 +01:00
Fermi 7b2c8e58ff Fixes freezing and ghost rider 2019-10-14 13:23:39 +01:00
Ghommie 9c1fcc341d Removes the need of "_l" suffixes for digitigrade clothing on mob states. 2019-10-14 08:20:23 +02:00
Ghommie 321c30cf89 now with 51% more loads. 2019-10-14 06:24:54 +02:00
Ghommie 3671755142 My cat resting on my neck is just sooo warm, like a best scarf. 2019-10-14 06:06:25 +02:00
Ghommie e969e89ce5 Well, byond quirks. 2019-10-14 03:09:15 +02:00
Poojawa dad9f7f6ce Helping edgecase things 2019-10-13 19:41:46 -05:00
Ghommie 22fc7a9088 Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype. 2019-10-14 02:32:23 +02:00
Poojawa bcb11a471d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-13 19:14:16 -05:00
Poojawa fad517fccb oh let's unsnowflake this one too I guess 2019-10-13 19:06:46 -05:00
Poojawa 198f2b7add Fixes missing decorative wing states 2019-10-13 19:02:28 -05:00
Thalpy 8a5562e92e Ghmoneie 2019-10-13 23:56:18 +01:00
Thalpy 924fa50659 Update code/modules/surgery/organs/organ_internal.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-10-13 23:55:42 +01:00
Thalpy 094221f4ae IndenettSADgsdfafhfdnfzbdf 2019-10-13 23:52:34 +01:00
Thalpy 7973347bf3 indent 2019-10-13 23:50:25 +01:00
Thalpy 1621c4c7d4 stupid bitflags 2019-10-13 23:50:08 +01:00
Thalpy e7c5e74d3a Hopefully no break 2019-10-13 23:41:06 +01:00
Ghommie ff3972247a Fixes some missing species_traits for cloth, clockwork and cult golems. 2019-10-13 23:40:52 +02:00
Thalpy 6a74bf7093 Removes pointless line 2019-10-13 22:35:43 +01:00
Thalpy ac2aba50a6 Turns Jacq into her own event 2019-10-13 22:33:46 +01:00
Thalpy 9f5b228bfe New Dart 2019-10-13 22:03:36 +01:00
kevinz000 4c52b7a416 Merge pull request #9339 from Ghommie/Ghommie-cit205
Removes revenant blight's shabby tox damage in favor of negative mood effects, and necropolis curse if not cured
2019-10-13 14:00:52 -07:00
kevinz000 48e4187cef Merge pull request #9461 from r4d6/master
Adding Decorative Wings
2019-10-13 14:00:07 -07:00
kevinz000 1fda4deef7 Merge pull request #9465 from Trilbyspaceclone/patch-230
Update granters.dm
2019-10-13 13:58:03 -07:00
kevinz000 53858e1818 Merge pull request #9416 from Ghommie/Ghommie-cit215
The niche singularity beacon now also moderately buffs meteor waves.
2019-10-13 13:56:03 -07:00
kevinz000 3d9f012cdb Merge pull request #9464 from JTGSZ/speciesrestrictions2
Re-adds latejoin menu qualifies for rank proc restrictions. Try number 2
2019-10-13 13:55:21 -07:00
kevinz000 064e6980f9 Merge pull request #9474 from Putnam3145/fix-nanites
Makes neural nanite programs not drain nanites on things they can't fix
2019-10-13 13:55:05 -07:00
kevinz000 adeb33cdae Merge pull request #9463 from Owai-Seek/minor-fixes
Updating Kinkmate item-list
2019-10-13 13:54:26 -07:00
kevinz000 bf1d4ed7d4 Update holidays.dm 2019-10-13 13:52:17 -07:00
kevinz000 d28b0fa5f9 Update species.dm 2019-10-13 13:49:55 -07:00
kevinz000 32b2d629e4 Merge pull request #9473 from PersianXerxes/stopCultSpareTPing
Set clockcult teleport in Captain's Quarters to false.
2019-10-13 13:46:40 -07:00
Zna12 18f10afcd7 Borgs are now consumable by scrub pups. 2019-10-13 15:23:50 -05:00
Thalpy 356a1279f1 Adds vars for the ball. 2019-10-13 20:06:40 +01:00
Thalpy a13218b99a Fixes Coronary and Lipo 2019-10-13 17:23:49 +01:00
Thalpy 150b20103e Random tab 2019-10-13 16:39:37 +01:00
Thalpy 764c3e5757 Missed one 2019-10-13 16:38:05 +01:00