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
0b6e621874
Merge branch 'raginmages' of https://github.com/Iamgoofball/-tg-station into GoofBlob
2015-01-01 10:59:22 +00:00
89acbc84ab
makes the code compile, fixes acid values
2015-01-01 02:32:55 -08:00
abe1f47459
forgot some things for acid blob
2015-01-01 02:17:13 -08:00
3d331d0802
Reagent Blobs
2015-01-01 02:07:12 -08:00
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
2014-12-31 23:19:43 -08:00
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
88105318a6
Defines allowed books in main bookcase define
2014-12-31 23:08:23 -05:00
371b66a334
Merge pull request #6678 from paprka/nitrile
...
Adds nitrile gloves
2015-01-01 00:29:04 -03:00
c17e25aafa
Polishes code with lists
2014-12-31 22:00:08 -05:00
7e48be5be0
Merge pull request #6686 from paprka/lizstutterv2
...
Removes lizard stuttering
2014-12-31 23:22:38 -03:00
34c4c02777
Merge pull request #6646 from RemieRichards/TerminalDecon
...
Terminal Deconstruction
2014-12-31 21:47:47 -03:00
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
cdb5066502
Merge pull request #6324 from Razharas/GenShit
...
Added datum mutations
2014-12-31 17:24:15 -03:00
877f90c11a
Merge pull request #6655 from phil235/SawnoffFix
...
Fixes shortening gun barrel
2014-12-31 15:11:27 -03:00
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
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
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
3752254766
Revert "Adds mouse pointers for different ui styles"
2014-12-31 02:17:50 -03:00
cfff3cd375
Merge pull request #6539 from Xhuis/pounce_nerf
...
Nerfs alien hunter pounce
2014-12-31 02:29:15 +01:00
ff173b82b1
Merge pull request #6656 from Ergovisavi/mushroom_samba
...
Fixes mushrooms preying on non mushrooms
2014-12-30 21:35:46 -03:00
a003cdc347
Lets you put hollowed books in bookcases
2014-12-30 19:18:08 -05:00
2d7e10ec67
Merge pull request #6662 from Menshin/retractor_not_a_weapon
...
Fixes retractor autolathe spawning.
2014-12-30 20:44:55 -03:00
1c88fbf615
Adds 3-second cooldown to alien hunter pounce; only triggers if successful
2014-12-30 18:19:35 -05:00
1329dbf3cb
Merge pull request #6652 from AnturK/cleanup
2014-12-30 11:10:08 -08:00
26fb835323
removes lizard stuttering
2014-12-30 10:04:50 -08:00
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
ee3617310e
Merge remote-tracking branch 'upstream/master' into droneFix
2014-12-30 13:32:51 +02:00
2607a456c0
Merge pull request #6634 from paprka/chefuniform
...
Makes the second cook spawn in short order cook clothes, fixes chef uniform
2014-12-30 03:45:13 -03:00
13539c5c8e
Merge branch 'master' of https://github.com/tgstation/-tg-station into nitrile
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
code/modules/clothing/gloves/boxing.dm
code/modules/clothing/gloves/miscellaneous.dm
2014-12-29 20:19:57 -08:00
c26de0f5d3
adds nitrile gloves
2014-12-29 20:14:41 -08:00
9ee5d52814
Merge pull request #6601 from paprka/walkthecat
...
Adds catwalks
2014-12-29 19:05:41 -08:00
bdbde78470
Fixes supermatter division by zero runtime
2014-12-29 21:48:21 -03:00
78e5b9e7c7
Merge pull request #6616 from paprka/pointerpride
...
Adds mouse pointers for different ui styles
2014-12-29 16:47:07 -03:00
a3f2d06b0b
Fixed retractor spawning an /obj/item/weapon/retractor when fabricated in an autolathe.
2014-12-29 20:46:01 +01:00
df2271c300
Merge pull request #6640 from Nyvrem/master
...
Preferred colours for Podpeople
2014-12-29 15:00:01 -03:00
f286d2602b
Fixes mushrooms not being cannibals only
2014-12-29 07:28:30 -08:00
9276e43e6e
Fixes eyepatch and night vision HUDs not working with examine sec record buttons
2014-12-29 18:23:47 +04:00
f7e6552e33
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-29 17:05:20 +03:00
48374658a8
Merge pull request #6638 from paprka/beamexplody
...
Fixes disabler beams exploding fuel tanks
2014-12-29 10:37:43 -03:00
aa79311dff
Fixes janiborg trashbag emptying
2014-12-29 14:21:08 +01:00
80cc2d4100
Merge pull request #6622 from Thunder12345/grammarFixes
...
Fixes for some grammer and formatting issues
2014-12-29 10:20:35 -03:00
d7dd967c34
Simplification
...
Simplified nuzzling, never knew visible_message wound repeat the first
argument if there weren't any others.
2014-12-29 11:35:48 +00:00
10b21b20ab
Conflicts resolution
...
In items weapons melee misc
2014-12-29 11:49:30 +03:00
418e3a0613
General cleanup
...
Fixed the magic text failing in monkey injectors
Removed lots of comments
Didnt fix mysterious list bounds runtime in tourettes
2014-12-29 11:36:01 +03:00
ad2fee37be
Merge pull request #6625 from phil235/HalluAttackAnimationFix
...
Fixes hallucinated attackers not doing the attack animation.
2014-12-29 01:56:19 -03:00
dc6f1895fe
Merge pull request #6608 from paprka/disablerrebuff
...
Reverts disabler nerf
2014-12-29 01:12:52 -03:00
67b32194f1
Merge pull request #6612 from paprka/fixesstamdamprojguns
...
Fixes stamina damage on projectile weapons
2014-12-29 00:57:24 -03:00
1869e9d6ae
reverts c90r stuff
2014-12-28 19:47:54 -08:00
bbc83fed1c
Merge branch 'master' of https://github.com/tgstation/-tg-station into policebatonfixy
2014-12-28 18:39:39 -08:00
iamgoofball
Remie Richards
MrStonedOne
Xhuis
tkdrg
phil235
phil235
Ergovisavi
paprka
Razharas
Perakp
hornygranny
Menshin
Lo6a4evskiy
AnturK
Thunder12345