Commit Graph

13319 Commits

Author SHA1 Message Date
iamgoofball 0ce0b4601b nerfs the blobbernaut a bit
more fixes

forgot to commit storage blobs

fixes

Blob Mania 1.5: Storage Blobs and Blob Broadcast

nerfs dark matter

Reagent Blob tweaks and adjustments

Added new blob reagents!
2015-01-01 19:30:33 -08:00
Remie Richards 36062d365b Adds "Split consciousness" a 100 cost, node requiring (think blobbernaut) power that produces a second blob overmind (with it's own unique reagent!)
Alters code to require only 1 var instead of 4, alters some cases where blobs of a different colour change.
Fixes the core and shield blobs of the overmind sometimes being a different colour to the rest.
Makes blob spores the same colour as their overmind, but retain the husk icon in zombie mode (These are slightly off colour due to still being orange by default)
2015-01-01 12:51:29 +00:00
Remie Richards 0b6e621874 Merge branch 'raginmages' of https://github.com/Iamgoofball/-tg-station into GoofBlob 2015-01-01 10:59:22 +00:00
iamgoofball 89acbc84ab makes the code compile, fixes acid values 2015-01-01 02:32:55 -08:00
iamgoofball abe1f47459 forgot some things for acid blob 2015-01-01 02:17:13 -08:00
iamgoofball 866c536239 whoops 2015-01-01 02:13:48 -08:00
iamgoofball 3d331d0802 Reagent Blobs 2015-01-01 02:07:12 -08:00
MrStonedOne 2bb2469038 Fixes error with logging admin rank changes to the user's database record.
I forgot to add a field to the query in commit 138567b7cf when I modified it.
2014-12-31 23:19:43 -08:00
tkdrg adc23dcd35 Merge pull request #6695 from Iamgoofball/raginmages
RAGIN' MAGES: Take 2: Working edition
2015-01-01 03:04:26 -03:00
Iamgoofball 56f2ec2721 >magin' 2014-12-31 21:58:21 -08:00
Iamgoofball 4b8bf0180e Update raginmages.dm 2014-12-31 21:55:38 -08:00
Iamgoofball 2c118837ad Update spellbook.dm 2014-12-31 21:30:27 -08:00
Remie Richards 215da4399a Merge pull request #6690 from Xhuis/hidden_book_in_bookcase
Allows you to put hollowed-out books in bookcases
2015-01-01 04:12:07 +00:00
Xhuis 88105318a6 Defines allowed books in main bookcase define 2014-12-31 23:08:23 -05:00
tkdrg 371b66a334 Merge pull request #6678 from paprka/nitrile
Adds nitrile gloves
2015-01-01 00:29:04 -03:00
Xhuis c17e25aafa Polishes code with lists 2014-12-31 22:00:08 -05:00
tkdrg 7e48be5be0 Merge pull request #6686 from paprka/lizstutterv2
Removes lizard stuttering
2014-12-31 23:22:38 -03:00
tkdrg 9a9f0bc058 Merge pull request #6691 from Menshin/clientless_peeking_runtime_fix
Fixes runtime with moving objects in/out of storage while clientless mobs peeking
2014-12-31 22:19:38 -03:00
tkdrg 34c4c02777 Merge pull request #6646 from RemieRichards/TerminalDecon
Terminal Deconstruction
2014-12-31 21:47:47 -03:00
Remie Richards 341b147088 You can now deconstruct terminals provided the APC or SMES is prepared for this (eg, open panels, exposed wires etc.) 2014-12-31 23:35:07 +00:00
tkdrg 4e134df3fd Merge pull request #6661 from Menshin/bend_pipes_atmos_fixes
Atmos pipes fixes and tweaks
2014-12-31 20:18:53 -03:00
tkdrg cdb5066502 Merge pull request #6324 from Razharas/GenShit
Added datum mutations
2014-12-31 17:24:15 -03:00
tkdrg 2dea549a25 Merge pull request #6683 from joonoro/master
Fixes arcade machine runtimes from #6351
2014-12-31 16:20:15 -03:00
tkdrg cb5428c554 Merge pull request #6685 from phil235/VisibleLingMsgFix
Fixes people getting the Ling's message when he reassimilates its armblade/shield.
2014-12-31 16:06:00 -03:00
tkdrg 877f90c11a Merge pull request #6655 from phil235/SawnoffFix
Fixes shortening gun barrel
2014-12-31 15:11:27 -03:00
Menshin b4e3b942db Removed a useless call to ..() in obj/pipe attack_by 2014-12-31 17:34:47 +01:00
phil235 286a9ce4bc Merge pull request #6657 from Lo6a4evskiy/Eyepatch_HUD_fix
All sec HUDs work properly with examine buttons
2014-12-31 15:45:40 +01:00
phil235 6cf7cd2c0b Merge pull request #6671 from tkdrg/fuckingSuperMatter-i_SwearTo=god'ThisdamnthingaaA
Fixes supermatter division by zero runtime
2014-12-31 15:42:10 +01:00
phil235 e476074b32 Merge pull request #6673 from GunHog/FixForTatorAIRadioAndRemovesSpice
Fixes #6654
2014-12-31 15:41:17 +01:00
phil235 3ce15f31b0 Merge pull request #6672 from Menshin/flash_emp_runtime_fix
Fixes flashes runtiming on EMP + flash spamming
2014-12-31 15:33:20 +01:00
Menshin 34cee3f088 Renamed confusing variable 2014-12-31 13:51:39 +01:00
phil235 183955a877 Fixes shortening barrel: only live chambered ammo goes off in your face; the gun goes off even if not in your hand; when blowing up "you fire the X" message won't show up anymore. 2014-12-31 12:04:39 +01:00
tkdrg 3752254766 Revert "Adds mouse pointers for different ui styles" 2014-12-31 02:17:50 -03:00
iamgoofball a0092b8e1b Conflicts: code/game/gamemodes/wizard/spellbook.dm 2014-12-30 20:22:11 -08:00
iamgoofball b63b7e528a Made Ragin' Mages actually work, ports and fixes from Hippiestation, improvements to the pacing, etc etc. 2014-12-30 17:34:58 -08:00
phil235 cfff3cd375 Merge pull request #6539 from Xhuis/pounce_nerf
Nerfs alien hunter pounce
2014-12-31 02:29:15 +01:00
Menshin 4db3268fcb Fixes runtime when moving objects in/out storage while a clientless mob is peeking on the storage panel 2014-12-31 01:54:25 +01:00
tkdrg ff173b82b1 Merge pull request #6656 from Ergovisavi/mushroom_samba
Fixes mushrooms preying on non mushrooms
2014-12-30 21:35:46 -03:00
Xhuis a003cdc347 Lets you put hollowed books in bookcases 2014-12-30 19:18:08 -05:00
tkdrg 829ba09986 Merge pull request #6244 from Ergovisavi/halp_medics_griffon_me
Adds Medical Hologram functionality to Medical Penlight
2014-12-30 20:52:46 -03:00
tkdrg 2d7e10ec67 Merge pull request #6662 from Menshin/retractor_not_a_weapon
Fixes retractor autolathe spawning.
2014-12-30 20:44:55 -03:00
Xhuis 1c88fbf615 Adds 3-second cooldown to alien hunter pounce; only triggers if successful 2014-12-30 18:19:35 -05:00
joonoro 716e14f716 Fixes arcade machine runtimes from #6351 2014-12-30 21:11:22 +02:00
Ergovisavi 1329dbf3cb Merge pull request #6652 from AnturK/cleanup 2014-12-30 11:10:08 -08:00
paprka 26fb835323 removes lizard stuttering 2014-12-30 10:04:50 -08:00
phil235 008f0e1b16 Fixes blind people getting the Ling's message when he reassimilates his armblade/shield. 2014-12-30 18:59:15 +01:00
tkdrg 0d33cc98af Merge pull request #6660 from Firecage/Mineral_Floor_Effects
Adds effects for the following mineral floors: Plasma, Uranium, Bananium...
2014-12-30 13:18:25 -03:00
joonoro 663e7d673a Fixes arcade machine runtime from #6351 2014-12-30 17:33:52 +02:00
Razharas d1f347f584 Fixes conflicts
There werent even any conflicts really, but git for some reason thought
there are
2014-12-30 15:12:09 +03:00
Perakp 953aab610c Changes a few more checks to accept drones in addition to silicons. 2014-12-30 13:50:10 +02:00