Commit Graph

18519 Commits

Author SHA1 Message Date
Jordie0608 e2d3488f7f database notes 2015-08-15 22:24:24 +10:00
Remie Richards fcbd841b60 Merge pull request #11138 from Miauw62/eckeck
Removes tape recorder wires to fix a server-crashing bug.
2015-08-10 13:03:10 +01:00
Miauw ad1da7c157 Removes tape recorder wires to fix a server-crashing bug. 2015-08-10 14:00:05 +02:00
Cheridan 4313c9c343 Merge pull request #11089 from RemieRichards/ItemDropMouseOpacity
Fixes items keeping mouse opacity if their container is destroyed
2015-08-09 21:47:57 -05:00
Cheridan b7ca110654 Merge pull request #11096 from Incoming5643/chen_goes_fishing
Stepping on horns now invokes the proper experience
2015-08-09 18:49:35 -05:00
Cheridan 13b43cba87 Merge pull request #11100 from phil235/BrainrotFix
Fixes brainrot being incurable.
2015-08-09 10:45:54 -05:00
phil235 9c44303661 Merge pull request #11057 from Cheridan/merely_pretending
Adds Astral Carpet Tiles
2015-08-09 11:51:35 +02:00
Cheridan 346848b875 Merge pull request #11084 from bgobandit/goofbotany
Adds several new reagent reactions to hydroponics.
2015-08-09 02:46:38 -05:00
Cheridan e7f95af201 Merge pull request #11092 from xxalpha/BOOOOOOOOOOOOM
Fixed inbuilt jetpacks dropping when suit is deleted.
2015-08-09 02:39:58 -05:00
Cheridan 63698004d6 Fixes Conflicts, Also Structural Code Stuff 2015-08-08 20:16:53 -05:00
Cheridan d915997ea7 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/11057
Conflicts:
	icons/obj/items.dmi
2015-08-08 19:36:36 -05:00
phil235 70a8046081 Merge pull request #10815 from bgobandit/bagtags
Body bag sprites now update their tag overlay properly.
2015-08-09 02:18:56 +02:00
bgobandit 1f3440649a fixes my shit 2015-08-08 19:49:09 -04:00
Cheridan 6a1324deb5 Merge pull request #11081 from phil235/AnnouncerRuntimeFix
Fixes runtime when spawning a sNPC
2015-08-08 10:49:29 -05:00
phil235 e3400c0fc8 Fixes brainrot being incurable. 2015-08-08 11:42:44 +02:00
Incoming ed6b59c78e Stepping on horns now invokes the proper experience. Now the clown can honk even if you disable its hands.
#NotDeadJustBusy

#ThisIsOverADecadeTooLate
2015-08-08 01:05:40 -04:00
xxalpha 008c70acea Fixed inbuilt jetpacks dropping when suit is deleted. 2015-08-08 04:05:51 +01:00
Remie Richards 8950ac851d Condenses some code. 2015-08-08 01:49:27 +01:00
Remie Richards f256246711 Merge branch 'master' of https://github.com/tgstation/-tg-station into OironTrailAdditions
Conflicts:
	code/game/machinery/computer/arcade.dm
2015-08-08 01:38:57 +01:00
Remie Richards 9fb63dbec9 Fixes items that survive a storage container's destruction keeping the storage mouse_opacity 2015-08-07 23:02:28 +01:00
bgobandit 7a613fc2b6 Adds several new reagent reactions to hydroponics. 2015-08-07 13:44:13 -04:00
Kevin Chen 0a65e62ce4 Merge branch 'master' of https://github.com/tgstation/-tg-station 2015-08-07 12:15:17 -04:00
phil235 d68e1a7b32 Fixes runtime when spawning a sNPC that is a head and the announcer proc can't find any mind.
Small simplification of emp_act and emag_act of the announcement_system.
2015-08-07 17:38:39 +02:00
phil235 bec7be024f Fixes runtime when firer is null. 2015-08-07 15:54:21 +02:00
Jordie f4b41b99bf Merge pull request #11016 from Core0verload/mmi
MMI ID lock removed
2015-08-07 19:38:27 +10:00
Jordie 63c545346d Merge pull request #10992 from RemieRichards/AlternateWornLayer
Adds alternate_worn_layer
2015-08-07 19:37:52 +10:00
Jordie 133f3ee433 Merge pull request #10944 from bustygoku/Carrier-RNG
Removes Virus Carrier RNG
2015-08-07 19:36:29 +10:00
Jordie 9aa0fcf55f Merge pull request #11015 from Core0verload/bedsheets
Better sprites for bed and bedsheets
2015-08-07 19:36:15 +10:00
Jordie 0b5223a687 Merge pull request #11041 from phil235/PlasmaCutterChange
Plasma cutter tweaks
2015-08-07 19:35:15 +10:00
Jordie 21ea1ee740 Merge pull request #11020 from francinum/patch-2
Fixes the Orion Trail board Name.
2015-08-07 19:33:59 +10:00
Jordie 032f1781a1 Merge pull request #11055 from Ikarrus/DOMINATING
Gang Dominator Tweaks
2015-08-07 19:32:51 +10:00
Jordie 0287f37405 Merge pull request #11049 from phil235/RunningOnYourBulletsFix
Fixes being able to run into your own bullet
2015-08-07 19:32:06 +10:00
Jordie 7a7a736684 Merge pull request #11023 from optimumtact/patch-6
remove some comments that were out of date and pointless
2015-08-07 19:31:31 +10:00
Cheridan 4bf33e17c2 Merge pull request #11056 from KorPhaeron/thismustbetheworkofanenemystand
Guardian Fixes/Ranged Simple Animal  Fixes
2015-08-07 00:33:00 -05:00
KorPhaeron 842339dbc6 More slight nerfs 2015-08-07 00:28:06 -05:00
KorPhaeron 616f3da3f4 Extra punctuation 2015-08-07 00:21:14 -05:00
Remie Richards 18d4a55a95 Merge pull request #11027 from MrStonedOne/patch-26
Admins can now use marked objs with atom proc call
2015-08-07 03:41:01 +01:00
KorPhaeron fc218bcf84 Nerfs Healer, adds checks to healer/bomb 2015-08-06 18:55:15 -05:00
Remie Richards cf5c2dc34d Merge pull request #11063 from phil235/AbductorMachineGlandFix
Fixes ayylien experimentation machine not finding the gland in the speciment
2015-08-06 23:51:40 +01:00
Kevin Chen 57870d14f1 Changes uranium to radium 2015-08-06 14:26:48 -04:00
Swag McYolosteinen 1252be6817 Merge pull request #11064 from Xhuis/shadowling_hotfix
Shadowling enthralling hotfix
2015-08-06 18:11:43 +02:00
Xhuis 82aec4efcf Shadowling enthrall hotfix 2015-08-06 11:58:16 -04:00
phil235 106b2e5485 Fixes ayylien experimentation machine not finding the gland in the specimen. 2015-08-06 17:36:56 +02:00
KorPhaeron 97543db0ed Words 2015-08-06 10:21:13 -05:00
phil235 5fdf491441 Merge pull request #11034 from francinum/patch-3
Fixes Orion Trail design datum
2015-08-06 16:56:17 +02:00
phil235 b90fcaa765 Remove mech immobilization when shooting.
Changed the fix to delete bullets the user is on the target loc while he fires so we don't get floating bullets.
2015-08-06 16:31:30 +02:00
KorPhaeron e9bec804a8 Ranged Version gets its own projectile 2015-08-06 00:13:36 -05:00
Cheridan eb210ab6e8 Adds Astral Carpet Tiles 2015-08-05 23:46:49 -05:00
KorPhaeron a8f9ddf56c Fixes ranged simple animals 2015-08-05 22:27:36 -05:00
KorPhaeron eb6a72a501 Guardian Fixes
Creating bombs with dense objects will make the bomb dense

The battlecry will only activate on mobs so you can't spam it on stuff with no clickdelay

Slightly nerfed the fire type (takes more damage, spreads less firestacks). Will probably need further balancing.

Using the communicate verb will now display the message for the user as well so you can keep track of your conversations better.
2015-08-05 22:00:08 -05:00