Commit Graph

4666 Commits

Author SHA1 Message Date
Remie Richards 5e93f57873 Fixes energy katana emag spam. Fixes energy nets not anchoring their target. Fixes runtime from upgrading suit cell. Ninja stars ability changed to summon one obj/item/weapon/throwing_star/ninja with throw mode auto toggle on for instant throwing. Added ninja sword recall, Allowing the ninja to recall their sword back to themselves, if they can see the sword the ability is free, and the sword throws itself towards the ninja, hitting people as it does so. 2015-04-04 18:17:37 +01:00
Jordie 9551919970 Merge pull request #8395 from xxalpha/jetpacktrail
Fixes the jetpack trail animation.
2015-03-19 16:44:37 +11:00
Jordie e5fdddc7d8 Merge pull request #8289 from Xhuis/alt_clicking
Allows alt-clicking for some stuff
2015-03-19 16:43:53 +11:00
xxalpha 50e4b1a024 Fixes jetpack trail animation.
Fixes jetpack trail animation 2.
2015-03-17 21:22:47 +00:00
Jordie cb9d49ab02 Merge pull request #8359 from xxalpha/stackfix
Fixes several zero amount stack bugs.
2015-03-17 17:10:04 +11:00
Jordie 0850fc626e Merge pull request #8358 from CandyClownTG/patch-1
Update fancy.dm
2015-03-17 17:09:37 +11:00
Jordie 9c148ff13e Merge pull request #8315 from phil235/BigUserdanger
Makes the message when you're attacked slightly bigger
2015-03-16 18:30:21 +11:00
phil235 d7f29d770c Merge pull request #8113 from Xhuis/boom_boom_shake_the_room
Restores gibbing for suicide C4
2015-03-15 22:50:12 +01:00
xxalpha c9d600e653 Fixes stack duping. 2015-03-15 19:04:07 +00:00
phil235 78d28a6d64 Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger
Conflicts:
	code/modules/events/ninja.dm
2015-03-15 12:30:27 +01:00
Cheridan cb07696814 Merge pull request #8319 from MMMiracles/bearpelts4everyone
Ability to put bears on meat spikes.
2015-03-15 02:34:07 -05:00
Cheridan da1e6f57f0 Merge pull request #8334 from MrPerson/cleanup_crew_comin_through
Code cleanup
2015-03-15 01:55:39 -05:00
Cheridan 0b7be73f62 Merge pull request #8286 from phil235/SteelcapFix
Steel cap, sandstone and welding fixes plus flashing refactor
2015-03-14 22:56:37 -05:00
CandyClownTG 87f0f44112 Update fancy.dm
Replaced Doctor's Delight with Omnizine to make Syndicate Smokes useful again.
2015-03-14 21:20:33 -04:00
Cheridan 0cdffeecfb Merge pull request #8296 from phil235/TablecraftFix
Tablecraft Fix and recipe detection
2015-03-14 19:41:56 -05:00
phil235 0232afd05d Fix typo in catalyst.
Fix flamethrower crafting recipe (now only use 1 rod, calls checkparts() to set up the weldingtool and igniter).
Fix lack of message when trying to turn on an unsecured welding tool.
Fix lack of icon update when clicking plasma tank with empty flamethrower.
2015-03-15 00:23:47 +01:00
Cheridan 52dfa42eb5 Merge pull request #8257 from phil235/ReflectFix
Simplifies laser reflection code
2015-03-14 16:15:52 -05:00
Cheridan f552aa0ce1 Merge pull request #8222 from Incoming5643/I_dont_even_know_who_I_am_anymore
Magic Mania 1.855: Appearances are everything
2015-03-13 23:01:34 -05:00
Cheridan ecb3a4e08f Merge pull request #8236 from phil235/DoughChange
Dough change
2015-03-13 15:34:39 -05:00
Cheridan e5428c1519 Merge pull request #8256 from phil235/StrangenessTextFix
Strangeness text, janicart, alien nest, weak golem fixes
2015-03-13 15:23:30 -05:00
Cheridan 3b89c07cd3 Merge pull request #8259 from phil235/BibleBookBagBug
Fixes book bags not being able to hold bibles and looking like backpacks
2015-03-13 12:51:10 -05:00
MrPerson 9038fb15af Code cleanup
Removed a bunch of unused or hardly used vars on /mob and /atom/movable.
Added defines for mob/living/var/mob_size so it's not using magic numbers.
2015-03-13 10:41:00 -07:00
Cheridan 28f6aae00c Merge branch 'NinjaCleanup' of git://github.com/RemieRichards/-tg-station into RemieRichards-NinjaCleanup
Conflicts:
	icons/mob/back.dmi

remie is a nerd btw
2015-03-12 20:47:11 -05:00
MMMiracles 93425742e5 bop 2015-03-12 20:00:10 -04:00
MMMiracles 8092764332 Adds the ability to spike bears on the meatspike for their pelt, as well as yield 5 meat instead of 3. Less messy, more efficient. 2015-03-12 19:50:23 -04:00
phil235 29609457f5 Makes the message when you're attacked slightly bigger for better visibility."
Changes two "for... show_message()" into "visible_message()".
2015-03-12 23:15:54 +01:00
phil235 16a0d7bf80 Fix for flamethrower deconstruction. 2015-03-12 19:58:37 +01:00
Xhuis 3bf0c7015a Replace some object verbs with alt-clicking 2015-03-10 21:28:13 -04:00
phil235 5d5c21266c Merge pull request #8262 from MMMiracles/usaneverdie
Liberation Station 3: Patriotic Tears
2015-03-11 00:26:33 +01:00
phil235 1eba7b694b Merge pull request #8134 from Miauw62/ghostradios
Adds a toggle so ghosts can hear radio chatter more easily.
2015-03-10 23:56:28 +01:00
phil235 7ba8af5222 Fixes steel cap bug. Steel cap now growns steel logs similar to wooden logs, you use the hatchet to get rods.
Reorganizes all flashing to use the same mob proc 'flash_eyes()' (welding tool use, flashbang, flashers, laserpointers, etc).
Fixes making sandstone not stacking the result sandstones on the floor.
Sandstone, grass tile and carpet tile now look for other incomplete stack on their creation location to try to put them all in one stack (exactly like wood planks).
Fix typos.
Remove banglet var from all flashbangs, making flashbangs from clusters behave exactly like the other ones.
Renames eyecheck()proc to check_eye_prot() and moves it to mob/living level, elso creates check_ear_prot() for checking ear protection.
2015-03-10 20:30:46 +01:00
Cheridan 72f465c864 Merge pull request #8138 from RemieRichards/BadminFuckingWithIcons
Clothing Icon File Admin Editing
2015-03-09 23:38:16 -05:00
MMMiracles 1b1ee50b00 ASS BLAST USA USA USA USA 2015-03-09 17:50:37 -04:00
Remie Richards 751fb4aaa9 Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks. 2015-03-09 21:48:45 +00:00
Xhuis 5e1c69a76a Removes unnecessary stuff 2015-03-09 16:48:41 -04:00
Xhuis 00e352cee2 Restores gibbing for suiciding with C4 2015-03-09 16:47:16 -04:00
phil235 4f6c96235b Fixes book bags not being able to hold bibles.
Changes the book bag sprite so it looks more like a briefcase and isn't confused with a backpack.
2015-03-09 21:13:01 +01:00
phil235 82b1b1adcd Merge branch 'master' of https://github.com/tgstation/-tg-station into DoughChange
Conflicts:
	icons/obj/food.dmi
2015-03-09 19:48:23 +01:00
phil235 79a20bd57b slight fix 2015-03-09 19:19:17 +01:00
phil235 71d560bd3a Fixes a runtime with buckling screen alert
Fixes being able to buckle to janicart while crit and when there's a dense object on the janicart's turf.
Fixes alien nest not buckling and being wrongly pixel shifted, and fixed a runtime.
Fixes golems being super easy to weaken by punch and not doing more damage themselves via punch.
Fixes some typos.
2015-03-09 19:09:52 +01:00
Incoming 1cb7674ebd Adds a cheap looking pulse animation for magic mirrors so wizards notice they are actually more than normal mirrors
Adds a changelog
2015-03-09 12:42:41 -04:00
phil235 4071f25270 Simplifies laser reflection code, no more reflect_chance var at the obj/item level. 2015-03-09 12:28:35 +01:00
Cheridan fbab136950 Merge pull request #8016 from RemieRichards/EmbeddingBalance
Embedded Item Balancing. Also fixes #8029
2015-03-09 02:03:18 -05:00
Cheridan f4734de342 Merge pull request #8162 from Jordie0608/thisdrillwillnotpiercetheheavensbecauseithasbroken
Fixes #8148, Improves drill's handling of power
2015-03-08 23:41:50 -05:00
Cheridan 662caa554f Merge pull request #8205 from phil235/AlienDisposalFix
Fixes disposal climbing.
2015-03-08 19:41:08 -05:00
phil235 1a092e0ede Changes how doughs are made. 10water+15flour chem reaction for dough. 15flour+15eggyolk+5sugar for cake batter (or alternatively for vegans 15 soymilk instead of the eggyolk).
Introduce egg yolk reagent
You can break eggs in open reagent containers or blend them to get egg yolk.
Fixes breadslices sprites and other merge conflict bugs in food.dmi.
Change customizable snack max volume to 60. Buff nutriment amount in doughs.
2015-03-08 22:15:55 +01:00
Incoming 9384d44ee5 Adds a magic mirror to the wizards shuttle. The magic mirror has greatly expanded functionality compared to the normal one, and can additionally change a wizards name, gender, race, hair color and eye color.
Additionally this fixes up some rogue simulated airless tiles on the wizards shuttle (these tiles were why the creature would always end up dead)
2015-03-08 04:24:04 -04:00
Remie Richards 7488c47e7a Merge pull request #8102 from Mandurrrh/tableclimbnerf
Balancing out tableclimbing.
2015-03-07 21:39:37 +00:00
phil235 77d553e619 Fixes disposal climbing.
Aliens, slimes and monkeys can climb into disposal but cannot flush it.
Non carbon mobs can no longer climb into disposal by themselves.
Stuffing another mob in a disposal unit is now only done via grabbing.(fixes bugs like stuffing someone while being inside the disposal yourself)
Large mobs no longer fit inside disposal.
Fixes hydrotray growing overlay layer.
Fixes slicing broken pipes dropping a straight pipe.
Fixes typos.
Removing unused var from disposal.
2015-03-07 19:35:44 +01:00
Cheridan 95e269e211 Merge pull request #8122 from Xhuis/miners_messiah
Adds the ore satchel of holding
2015-03-06 15:15:40 -06:00